From 750d30f760e5441913292c18d189e1077bcc4de8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Le=C5=9Bniak?= <michal.lesniak@ravendb.net>
Date: Thu, 14 Aug 2025 18:16:23 +0200
Subject: [PATCH] RDoc-3442 and RDoc-3459

---
 .../gen-ai-integration/gen-ai-overview.mdx       |  6 +++---
 docs/client-api/commands/documents/delete.mdx    |  4 ++--
 docs/client-api/commands/documents/put.mdx       |  4 ++--
 .../consumption/api-overview.mdx                 | 16 ++++++++--------
 .../data-subscriptions/creation/examples.mdx     |  4 ++--
 docs/client-api/faq/transaction-support.mdx      |  2 +-
 docs/client-api/session/updating-entities.mdx    | 16 ++++++++--------
 .../what-is-a-session-and-how-does-it-work.mdx   | 10 +++++-----
 .../document-extensions/attachments/indexing.mdx | 12 ++++++------
 docs/indexes/multi-map-indexes.mdx               |  2 +-
 docs/indexes/using-dynamic-fields.mdx            | 10 +++++-----
 .../clustering/distribution/cluster-observer.mdx |  2 +-
 .../distribution/distributed-database.mdx        |  2 +-
 .../replication/replication-overview.mdx         |  2 +-
 docs/sharding/migration.mdx                      |  2 +-
 docs/sharding/subscriptions.mdx                  |  2 +-
 docs/start/installation/setup-wizard.mdx         |  2 +-
 docs/start/licensing/renew-license.mdx           |  2 +-
 docs/studio/cluster/cluster-view.mdx             |  2 +-
 .../studio/database/indexes/create-map-index.mdx |  4 ++--
 .../consumption/api-overview.mdx                 | 12 ++++++------
 .../data-subscriptions/creation/api-overview.mdx |  2 +-
 .../client-api/faq/transaction-support.mdx       |  2 +-
 .../clustering/distribution/cluster-observer.mdx |  2 +-
 .../server/ongoing-tasks/etl/raven.mdx           |  2 +-
 .../studio/database/indexes/create-map-index.mdx |  4 ++--
 .../database/tasks/ongoing-tasks/backup-task.mdx |  2 +-
 .../studio/server/cluster/cluster-view.mdx       |  2 +-
 .../consumption/api-overview.mdx                 |  8 ++++----
 .../data-subscriptions/consumption/examples.mdx  |  4 ++--
 .../data-subscriptions/creation/api-overview.mdx |  2 +-
 .../client-api/faq/transaction-support.mdx       |  2 +-
 .../clustering/distribution/cluster-observer.mdx |  2 +-
 .../start/installation/setup-wizard.mdx          |  2 +-
 .../studio/database/indexes/create-map-index.mdx |  4 ++--
 .../database/tasks/ongoing-tasks/backup-task.mdx |  2 +-
 .../studio/server/cluster/cluster-view.mdx       |  2 +-
 .../consumption/api-overview.mdx                 |  8 ++++----
 .../data-subscriptions/consumption/examples.mdx  |  4 ++--
 .../data-subscriptions/creation/api-overview.mdx |  2 +-
 .../client-api/faq/transaction-support.mdx       |  2 +-
 .../clustering/distribution/cluster-observer.mdx |  2 +-
 .../start/installation/setup-wizard.mdx          |  2 +-
 .../studio/database/indexes/create-map-index.mdx |  4 ++--
 .../database/tasks/ongoing-tasks/backup-task.mdx |  2 +-
 .../studio/server/cluster/cluster-view.mdx       |  2 +-
 .../consumption/api-overview.mdx                 |  8 ++++----
 .../data-subscriptions/consumption/examples.mdx  |  4 ++--
 .../data-subscriptions/creation/api-overview.mdx |  2 +-
 .../client-api/faq/transaction-support.mdx       |  2 +-
 .../clustering/distribution/cluster-observer.mdx |  2 +-
 .../start/installation/setup-wizard.mdx          |  2 +-
 .../studio/database/indexes/create-map-index.mdx |  4 ++--
 .../database/tasks/ongoing-tasks/backup-task.mdx |  2 +-
 .../studio/server/cluster/cluster-view.mdx       |  2 +-
 .../consumption/api-overview.mdx                 |  8 ++++----
 .../data-subscriptions/consumption/examples.mdx  |  4 ++--
 .../data-subscriptions/creation/api-overview.mdx |  2 +-
 .../client-api/faq/transaction-support.mdx       |  2 +-
 .../clustering/distribution/cluster-observer.mdx |  2 +-
 .../start/installation/setup-wizard.mdx          |  2 +-
 .../studio/database/indexes/create-map-index.mdx |  4 ++--
 .../studio/server/cluster/cluster-view.mdx       |  2 +-
 .../consumption/api-overview.mdx                 |  8 ++++----
 .../data-subscriptions/consumption/examples.mdx  |  4 ++--
 .../data-subscriptions/creation/api-overview.mdx |  2 +-
 .../client-api/faq/transaction-support.mdx       |  2 +-
 .../client-api/session/updating-entities.mdx     |  8 ++++----
 .../what-is-a-session-and-how-does-it-work.mdx   |  6 +++---
 .../version-5.2/indexes/using-dynamic-fields.mdx |  6 +++---
 .../clustering/distribution/cluster-observer.mdx |  2 +-
 .../replication/replication-overview.mdx         |  2 +-
 .../start/installation/setup-wizard.mdx          |  2 +-
 .../start/licensing/renew-license.mdx            |  2 +-
 .../version-5.2/studio/cluster/cluster-view.mdx  |  2 +-
 .../studio/database/indexes/create-map-index.mdx |  4 ++--
 .../consumption/api-overview.mdx                 |  8 ++++----
 .../data-subscriptions/consumption/examples.mdx  |  4 ++--
 .../data-subscriptions/creation/api-overview.mdx |  2 +-
 .../client-api/faq/transaction-support.mdx       |  2 +-
 .../client-api/session/updating-entities.mdx     |  8 ++++----
 .../what-is-a-session-and-how-does-it-work.mdx   |  6 +++---
 .../version-5.3/indexes/using-dynamic-fields.mdx |  6 +++---
 .../clustering/distribution/cluster-observer.mdx |  2 +-
 .../replication/replication-overview.mdx         |  2 +-
 .../start/installation/setup-wizard.mdx          |  2 +-
 .../start/licensing/renew-license.mdx            |  2 +-
 .../version-5.3/studio/cluster/cluster-view.mdx  |  2 +-
 .../studio/database/indexes/create-map-index.mdx |  4 ++--
 .../consumption/api-overview.mdx                 | 16 ++++++++--------
 .../data-subscriptions/creation/api-overview.mdx |  4 ++--
 .../data-subscriptions/creation/examples.mdx     |  4 ++--
 .../client-api/faq/transaction-support.mdx       |  2 +-
 .../client-api/session/updating-entities.mdx     | 16 ++++++++--------
 .../what-is-a-session-and-how-does-it-work.mdx   | 10 +++++-----
 .../document-extensions/attachments/indexing.mdx | 12 ++++++------
 .../version-5.4/indexes/multi-map-indexes.mdx    |  2 +-
 .../version-5.4/indexes/using-dynamic-fields.mdx | 10 +++++-----
 .../clustering/distribution/cluster-observer.mdx |  2 +-
 .../replication/replication-overview.mdx         |  2 +-
 .../start/installation/setup-wizard.mdx          |  2 +-
 .../start/licensing/renew-license.mdx            |  2 +-
 .../version-5.4/studio/cluster/cluster-view.mdx  |  2 +-
 .../studio/database/indexes/create-map-index.mdx |  4 ++--
 .../client-api/commands/documents/delete.mdx     |  4 ++--
 .../client-api/commands/documents/put.mdx        |  4 ++--
 .../consumption/api-overview.mdx                 | 16 ++++++++--------
 .../data-subscriptions/creation/api-overview.mdx |  4 ++--
 .../data-subscriptions/creation/examples.mdx     |  4 ++--
 .../client-api/faq/transaction-support.mdx       |  2 +-
 .../client-api/session/updating-entities.mdx     | 16 ++++++++--------
 .../what-is-a-session-and-how-does-it-work.mdx   | 10 +++++-----
 .../document-extensions/attachments/indexing.mdx | 12 ++++++------
 .../version-6.0/indexes/multi-map-indexes.mdx    |  2 +-
 .../version-6.0/indexes/using-dynamic-fields.mdx | 10 +++++-----
 .../migration/server/server-breaking-changes.mdx |  2 +-
 .../clustering/distribution/cluster-observer.mdx |  2 +-
 .../distribution/distributed-database.mdx        |  2 +-
 .../replication/replication-overview.mdx         |  2 +-
 .../version-6.0/sharding/migration.mdx           |  2 +-
 .../version-6.0/sharding/subscriptions.mdx       |  2 +-
 .../start/installation/setup-wizard.mdx          |  2 +-
 .../start/licensing/renew-license.mdx            |  2 +-
 .../version-6.0/studio/cluster/cluster-view.mdx  |  2 +-
 .../studio/database/indexes/create-map-index.mdx |  4 ++--
 .../client-api/commands/documents/delete.mdx     |  4 ++--
 .../client-api/commands/documents/put.mdx        |  4 ++--
 .../consumption/api-overview.mdx                 | 16 ++++++++--------
 .../data-subscriptions/creation/api-overview.mdx |  4 ++--
 .../data-subscriptions/creation/examples.mdx     |  4 ++--
 .../client-api/faq/transaction-support.mdx       |  2 +-
 .../client-api/session/updating-entities.mdx     | 16 ++++++++--------
 .../what-is-a-session-and-how-does-it-work.mdx   | 10 +++++-----
 .../document-extensions/attachments/indexing.mdx | 12 ++++++------
 .../version-6.2/indexes/multi-map-indexes.mdx    |  2 +-
 .../version-6.2/indexes/using-dynamic-fields.mdx | 10 +++++-----
 .../client-api/client-breaking-changes.mdx       |  2 +-
 .../clustering/distribution/cluster-observer.mdx |  2 +-
 .../distribution/distributed-database.mdx        |  2 +-
 .../replication/replication-overview.mdx         |  2 +-
 .../version-6.2/sharding/migration.mdx           |  2 +-
 .../version-6.2/sharding/subscriptions.mdx       |  2 +-
 .../start/installation/setup-wizard.mdx          |  2 +-
 .../start/licensing/renew-license.mdx            |  2 +-
 .../version-6.2/studio/cluster/cluster-view.mdx  |  2 +-
 .../studio/database/indexes/create-map-index.mdx |  4 ++--
 .../client-api/commands/documents/delete.mdx     |  4 ++--
 .../client-api/commands/documents/put.mdx        |  4 ++--
 .../consumption/api-overview.mdx                 | 16 ++++++++--------
 .../data-subscriptions/creation/examples.mdx     |  4 ++--
 .../client-api/faq/transaction-support.mdx       |  2 +-
 .../client-api/session/updating-entities.mdx     | 16 ++++++++--------
 .../what-is-a-session-and-how-does-it-work.mdx   | 10 +++++-----
 .../document-extensions/attachments/indexing.mdx | 12 ++++++------
 .../version-7.0/indexes/multi-map-indexes.mdx    |  2 +-
 .../version-7.0/indexes/using-dynamic-fields.mdx | 10 +++++-----
 .../clustering/distribution/cluster-observer.mdx |  2 +-
 .../distribution/distributed-database.mdx        |  2 +-
 .../replication/replication-overview.mdx         |  2 +-
 .../version-7.0/sharding/migration.mdx           |  2 +-
 .../version-7.0/sharding/subscriptions.mdx       |  2 +-
 .../start/installation/setup-wizard.mdx          |  2 +-
 .../start/licensing/renew-license.mdx            |  2 +-
 .../version-7.0/studio/cluster/cluster-view.mdx  |  2 +-
 .../studio/database/indexes/create-map-index.mdx |  4 ++--
 165 files changed, 373 insertions(+), 373 deletions(-)

diff --git a/docs/ai-integration/gen-ai-integration/gen-ai-overview.mdx b/docs/ai-integration/gen-ai-integration/gen-ai-overview.mdx
index 3b5cc9e6b0..c7379328f8 100644
--- a/docs/ai-integration/gen-ai-integration/gen-ai-overview.mdx
+++ b/docs/ai-integration/gen-ai-integration/gen-ai-overview.mdx
@@ -49,7 +49,7 @@ and reacts when a document is added or modified by Retrieving the document, Gene
 based on its data, Sending these objects to a generative AI model along with instructions regarding what 
 to do with the data and how to format the reply, and potentially Acting upon the model's response.  
 
-<Admonition type="note" title="&lt;a id=the-flow /&gt;The flow" id="lt-a-id-the-flow-gt-the-flow" href="#lt-a-id-the-flow-gt-the-flow">
+<Admonition type="note" title="The flow" id="the-flow" href="#the-flow">
 Let's put the above stages in order.
 <br/>
 <br/>
@@ -73,7 +73,7 @@ Let's put the above stages in order.
    is applied to handle the results.  
 </Admonition>
 
-<Admonition type="note" title="&lt;a id=the-elements /&gt;The elements" id="lt-a-id-the-elements-gt-the-elements" href="#lt-a-id-the-elements-gt-the-elements">
+<Admonition type="note" title="The elements" id="the-elements" href="#the-elements">
 These are the elements that need to be defined for a GenAI task.
 <br/>
 <br/>
@@ -186,7 +186,7 @@ if($output.Blocked)
 
 </Admonition>
 
-<Admonition type="note" title="&lt;a id=how-to-create-and-run-a-gen-ai-task /&gt;How to create and run a GenAI task" id="lt-a-id-how-to-create-and-run-a-gen-ai-task-gt-how-to-create-and-run-a-genai-task" href="#lt-a-id-how-to-create-and-run-a-gen-ai-task-gt-how-to-create-and-run-a-genai-task">
+<Admonition type="note" title="How to create and run a GenAI task" id="how-to-create-and-run-a-genai-task" href="#how-to-create-and-run-a-genai-task">
 
 * You can use [Studio's intuitive wizard](../../ai-integration/gen-ai-integration/gen-ai-studio.mdx#add-a-genai-task) 
   to create GenAI tasks. The wizard will guide you through the task creation phases, 
diff --git a/docs/client-api/commands/documents/delete.mdx b/docs/client-api/commands/documents/delete.mdx
index 60b97e52ea..430737f570 100644
--- a/docs/client-api/commands/documents/delete.mdx
+++ b/docs/client-api/commands/documents/delete.mdx
@@ -159,7 +159,7 @@ catch (Exception e)
 | Parameter        | Type     | Description                                                                                                                                                                                                                                             |
 |------------------|----------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | **id**           | `string` | The ID of the document to delete.                                                                                                                                                                                                                       |
-| **changeVector** | `string` | The change-vector of the document you wish to delete,<br/>used for [optimistic concurrency control](../../../server/clustering/replication/change-vector.mdx#concurrency-control-&-change-vectors).<br/>Pass `null` to skip the check and force the deletion. |
+| **changeVector** | `string` | The change-vector of the document you wish to delete,<br/>used for [optimistic concurrency control](../../../server/clustering/replication/change-vector.mdx#concurrency-control--change-vectors).<br/>Pass `null` to skip the check and force the deletion. |
 
 
 
@@ -376,7 +376,7 @@ catch (err) \{
 | Parameter        | Type     | Description                                                                                                                                                                                                                                             |
 |------------------|----------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | **id**           | `string` | The ID of the document to delete.                                                                                                                                                                                                                       |
-| **changeVector** | `string` | The change-vector of the document you wish to delete,<br/>used for [optimistic concurrency control](../../../server/clustering/replication/change-vector.mdx#concurrency-control-&-change-vectors).<br/>Pass `null` to skip the check and force the deletion. |
+| **changeVector** | `string` | The change-vector of the document you wish to delete,<br/>used for [optimistic concurrency control](../../../server/clustering/replication/change-vector.mdx#concurrency-control--change-vectors).<br/>Pass `null` to skip the check and force the deletion. |
 
 
 
diff --git a/docs/client-api/commands/documents/put.mdx b/docs/client-api/commands/documents/put.mdx
index bbb24eb9f5..0ed48b248c 100644
--- a/docs/client-api/commands/documents/put.mdx
+++ b/docs/client-api/commands/documents/put.mdx
@@ -193,7 +193,7 @@ var theDocumentCV = putResult.ChangeVector;
 | Parameter        | Type                        | Description                                                                                                                                                                                                                                          |
 |------------------|-----------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | **id**           | `string`                    | Unique ID under which document will be stored.                                                                                                                                                                                                       |
-| **changeVector** | `string`                    | The change-vector of the document you wish to update,<br/>used for [optimistic concurrency control](../../../server/clustering/replication/change-vector.mdx#concurrency-control-&-change-vectors).<br/>Pass `null` to skip the check and force the 'put'. |
+| **changeVector** | `string`                    | The change-vector of the document you wish to update,<br/>used for [optimistic concurrency control](../../../server/clustering/replication/change-vector.mdx#concurrency-control--change-vectors).<br/>Pass `null` to skip the check and force the 'put'. |
 | **document**     | `BlittableJsonReaderObject` | The document to store. Use:<br/>`session.Advanced.JsonConverter.ToBlittable(doc, docInfo);` to convert your entity to a `BlittableJsonReaderObject`.                                                                                                  |
 
 <TabItem value="syntax_2" label="syntax_2">
@@ -478,7 +478,7 @@ assert.strictEqual(theDocumentID, "categories/999");
 | Parameter        | Type     | Description                                                                                                                                                                                                                                          |
 |------------------|----------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | **id**           | `string` | Unique ID under which document will be stored.                                                                                                                                                                                                       |
-| **changeVector** | `string` | The change-vector of the document you wish to update,<br/>used for [optimistic concurrency control](../../../server/clustering/replication/change-vector.mdx#concurrency-control-&-change-vectors).<br/>Pass `null` to skip the check and force the 'put'. |
+| **changeVector** | `string` | The change-vector of the document you wish to update,<br/>used for [optimistic concurrency control](../../../server/clustering/replication/change-vector.mdx#concurrency-control--change-vectors).<br/>Pass `null` to skip the check and force the 'put'. |
 | **document**     | `object` | The document to store.                                                                                                                                                                                                                               |
 
 <TabItem value="syntax_2" label="syntax_2">
diff --git a/docs/client-api/data-subscriptions/consumption/api-overview.mdx b/docs/client-api/data-subscriptions/consumption/api-overview.mdx
index 697cbb83d1..963d017485 100644
--- a/docs/client-api/data-subscriptions/consumption/api-overview.mdx
+++ b/docs/client-api/data-subscriptions/consumption/api-overview.mdx
@@ -25,9 +25,9 @@ export const supportedLanguages = ["csharp", "java", "python", "nodejs"];
    * [Create the subscription worker](../../../client-api/data-subscriptions/consumption/api-overview.mdx#create-the-subscription-worker)  
    * [SubscriptionWorkerOptions](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworkeroptions)  
    * [Run the subscription worker](../../../client-api/data-subscriptions/consumption/api-overview.mdx#run-the-subscription-worker)  
-   * [SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatch&lt;t&gt;)  
-   * [SubscriptionBatch&lt;T&gt;.Item](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatch&lt;t&gt;item)  
-   * [SubscriptionWorker&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworker&lt;t&gt;)  
+   * [SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatcht)  
+   * [SubscriptionBatch&lt;T&gt;.Item](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatchtitem)  
+   * [SubscriptionWorker&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworkert)  
 
 </Admonition>
 ## Create the subscription worker
@@ -129,7 +129,7 @@ Learn more about `SubscriptionOpeningStrategy` in [worker strategies](../../../c
 ## Run the subscription worker
 
 After [creating](../../../client-api/data-subscriptions/consumption/api-overview.mdx#create-the-subscription-worker) a subscription worker, the subscription worker is still not processing any documents.  
-To start processing, you need to call the `Run` method of the [SubscriptionWorker](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworker&lt;t&gt;).  
+To start processing, you need to call the `Run` method of the [SubscriptionWorker](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworkert).  
 
 The `Run` function takes a delegate, which is your client-side code responsible for processing the received document batches.
 
@@ -160,7 +160,7 @@ Task Run(Func<SubscriptionBatch<T>, Task> processDocuments,
 
 | Member                   | Type                              | Description                                                                                                                                                            |
 |--------------------------|-----------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| **Items**                | `List<SubscriptionBatch<T>.Item>` | List of items in the batch.<br/>See [SubscriptionBatch&lt;T&gt;.Item](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatch&lt;t&gt;item) below. |
+| **Items**                | `List<SubscriptionBatch<T>.Item>` | List of items in the batch.<br/>See [SubscriptionBatch&lt;T&gt;.Item](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatchtitem) below. |
 | **NumberOfItemsInBatch** | `int`                             | Number of items in the batch.                                                                                                                                          |
 
 | Method Signature       | Return value            | Description                                                                                                       |
@@ -285,8 +285,8 @@ Using it outside this scope may cause unexpected behavior.
    * [Create the subscription worker](../../../client-api/data-subscriptions/consumption/api-overview.mdx#create-the-subscription-worker)
    * [SubscriptionWorkerOptions](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworkeroptions)  
    * [Run the subscription worker](../../../client-api/data-subscriptions/consumption/api-overview.mdx#run-the-subscription-worker)  
-   * [SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatch&lt;t&gt;)  
-   * [SubscriptionWorker&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworker&lt;t&gt;)  
+   * [SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatcht)  
+   * [SubscriptionWorker&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworkert)  
 
 </Admonition>
 ## Create the subscription worker
@@ -350,7 +350,7 @@ All other parameters are optional and will default to their respective default v
 ## Run the subscription worker
 
 After [creating](../../../client-api/data-subscriptions/consumption/api-overview.mdx#create-the-subscription-worker) a subscription worker, the subscription worker is still not processing any documents.  
-To start processing, you need to call the `run` method of the [SubscriptionWorker](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworker&lt;t&gt;).
+To start processing, you need to call the `run` method of the [SubscriptionWorker](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworkert).
 
 The `run` function takes a delegate, which is your client-side code responsible for processing the received document batches.
 
diff --git a/docs/client-api/data-subscriptions/creation/examples.mdx b/docs/client-api/data-subscriptions/creation/examples.mdx
index 1914e600aa..d30f03a020 100644
--- a/docs/client-api/data-subscriptions/creation/examples.mdx
+++ b/docs/client-api/data-subscriptions/creation/examples.mdx
@@ -278,7 +278,7 @@ See how to consume this type of subscription [here](../../../client-api/data-sub
 **Include using builder**:
 
 Include statements can be added to the subscription with `ISubscriptionIncludeBuilder`.  
-This builder is assigned to the  `Includes` property in [SubscriptionCreationOptions&lt;T&gt;](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptions&lt;t&gt;).  
+This builder is assigned to the  `Includes` property in [SubscriptionCreationOptions&lt;T&gt;](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptionst).  
 It supports methods for including documents as well as [counters](../../../client-api/data-subscriptions/creation/examples.mdx#create-subscription---include-counters). 
 These methods can be chained.
 
@@ -700,7 +700,7 @@ See how to consume this type of subscription [here](../../../client-api/data-sub
 **Include using builder**:
 
 Include statements can be added to the subscription with `SubscriptionIncludeBuilder`.  
-This builder is assigned to the  `includes` property in [SubscriptionCreationOptions](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptions&lt;t&gt;).  
+This builder is assigned to the  `includes` property in [SubscriptionCreationOptions](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptionst).  
 It supports methods for including documents as well as [counters](../../../client-api/data-subscriptions/creation/examples.mdx#create-subscription---include-counters).
 These methods can be chained.  
 
diff --git a/docs/client-api/faq/transaction-support.mdx b/docs/client-api/faq/transaction-support.mdx
index cf50fc670d..feb3ea203b 100644
--- a/docs/client-api/faq/transaction-support.mdx
+++ b/docs/client-api/faq/transaction-support.mdx
@@ -174,7 +174,7 @@ If you care about avoiding lost updates, you need to ensure you have the conflic
 
 The following is an important aspect to RavenDB's transactional behavior with regards to asynchronous replication.  
 
-When replicating modifications to another server, RavenDB will ensure that the [transaction boundaries](../../server/clustering/replication/replication-overview.mdx#replication-&-transaction-boundary) are maintained.  
+When replicating modifications to another server, RavenDB will ensure that the [transaction boundaries](../../server/clustering/replication/replication-overview.mdx#replication--transaction-boundary) are maintained.  
 If there are several document modifications in the same transaction they will be sent in the same replication batch, keeping the transaction boundary on the destination as well.  
 
 However, a special attention is needed when a document is modified in two separate transactions but the replication of the first transaction has not occurred yet. 
diff --git a/docs/client-api/session/updating-entities.mdx b/docs/client-api/session/updating-entities.mdx
index f4a0148763..8e5d3dc888 100644
--- a/docs/client-api/session/updating-entities.mdx
+++ b/docs/client-api/session/updating-entities.mdx
@@ -35,8 +35,8 @@ export const supportedLanguages = ["csharp", "python", "php", "nodejs"];
 
 
 * In this page:
-    * [Load a document & update](../../client-api/session/updating-entities.mdx#load-a-document-&-update)
-    * [Query for documents & update](../../client-api/session/updating-entities.mdx#query-for-documents-&-update)
+    * [Load a document & update](../../client-api/session/updating-entities.mdx#load-a-document--update)
+    * [Query for documents & update](../../client-api/session/updating-entities.mdx#query-for-documents--update)
     
 </Admonition>
 ## Load a document & update
@@ -158,8 +158,8 @@ export const supportedLanguages = ["csharp", "python", "php", "nodejs"];
 
 
 * In this page:
-    * [Load a document & update](../../client-api/session/updating-entities.mdx#load-a-document-&-update)
-    * [Query for documents & update](../../client-api/session/updating-entities.mdx#query-for-documents-&-update)
+    * [Load a document & update](../../client-api/session/updating-entities.mdx#load-a-document--update)
+    * [Query for documents & update](../../client-api/session/updating-entities.mdx#query-for-documents--update)
     
 </Admonition>
 ## Load a document & update
@@ -236,8 +236,8 @@ export const supportedLanguages = ["csharp", "python", "php", "nodejs"];
 
 
 * In this page:
-    * [Load a document & update](../../client-api/session/updating-entities.mdx#load-a-document-&-update)
-    * [Query for documents & update](../../client-api/session/updating-entities.mdx#query-for-documents-&-update)
+    * [Load a document & update](../../client-api/session/updating-entities.mdx#load-a-document--update)
+    * [Query for documents & update](../../client-api/session/updating-entities.mdx#query-for-documents--update)
     
 </Admonition>
 ## Load a document & update
@@ -323,8 +323,8 @@ try \{
 
 
 * In this page:
-    * [Load a document & update](../../client-api/session/updating-entities.mdx#load-a-document-&-update)
-    * [Query for documents & update](../../client-api/session/updating-entities.mdx#query-for-documents-&-update)
+    * [Load a document & update](../../client-api/session/updating-entities.mdx#load-a-document--update)
+    * [Query for documents & update](../../client-api/session/updating-entities.mdx#query-for-documents--update)
 
 </Admonition>
 ## Load a document & update
diff --git a/docs/client-api/session/what-is-a-session-and-how-does-it-work.mdx b/docs/client-api/session/what-is-a-session-and-how-does-it-work.mdx
index 857a8135bf..1dba0285f5 100644
--- a/docs/client-api/session/what-is-a-session-and-how-does-it-work.mdx
+++ b/docs/client-api/session/what-is-a-session-and-how-does-it-work.mdx
@@ -31,7 +31,7 @@ export const supportedLanguages = ["csharp", "java", "python", "php", "nodejs"];
       * [Create document example](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#create-document-example)
       * [Modify document example](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#modify-document-example)
   * [Identity map pattern](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#identity-map-pattern)
-  * [Batching & Transactions](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#batching-&-transactions)
+  * [Batching & Transactions](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#batching--transactions)
   * [Concurrency control](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#concurrency-control)
   * [Reducing server calls (best practices) for:](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#reducing-server-calls-(best-practices)-for:)  
       * [The N+1 problem](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#the-select-n1-problem)    
@@ -380,7 +380,7 @@ To address this, the session API offers the concurrency control feature.
         * [Create document example](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#create-document-example)
         * [Modify document example](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#modify-document-example)
     * [Identity map pattern](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#identity-map-pattern)
-    * [Batching & Transactions](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#batching-&-transactions)
+    * [Batching & Transactions](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#batching--transactions)
     * [Concurrency control](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#concurrency-control)
     * [Reducing server calls (best practices) for:](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#reducing-server-calls-(best-practices)-for:)
         * [The N+1 problem](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#the-select-n1-problem)
@@ -669,7 +669,7 @@ To address this, the session API offers the concurrency control feature.
       * [Create document example](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#create-document-example)
       * [Modify document example](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#modify-document-example)
   * [Identity map pattern](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#identity-map-pattern)
-  * [Batching & Transactions](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#batching-&-transactions)
+  * [Batching & Transactions](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#batching--transactions)
   * [Concurrency control](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#concurrency-control)
   * [Reducing server calls (best practices) for:](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#reducing-server-calls-(best-practices)-for:)  
       * [The N+1 problem](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#the-select-n1-problem)    
@@ -953,7 +953,7 @@ To address this, the session API offers the concurrency control feature.
       * [Create document example](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#create-document-example)
       * [Modify document example](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#modify-document-example)
   * [Identity map pattern](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#identity-map-pattern)
-  * [Batching & Transactions](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#batching-&-transactions)
+  * [Batching & Transactions](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#batching--transactions)
   * [Concurrency control](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#concurrency-control)
   * [Reducing server calls (best practices) for:](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#reducing-server-calls-(best-practices)-for:)  
       * [The N+1 problem](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#the-select-n1-problem)    
@@ -1247,7 +1247,7 @@ To address this, the session API offers the concurrency control feature.
         * [Create document example](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#create-document-example)
         * [Modify document example](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#modify-document-example)
     * [Identity map pattern](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#identity-map-pattern)
-    * [Batching & Transactions](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#batching-&-transactions)
+    * [Batching & Transactions](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#batching--transactions)
     * [Concurrency control](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#concurrency-control)
     * [Reducing server calls (best practices) for:](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#reducing-server-calls-(best-practices)-for:)
         * [The N+1 problem](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#the-select-n1-problem)
diff --git a/docs/document-extensions/attachments/indexing.mdx b/docs/document-extensions/attachments/indexing.mdx
index 5c2aae2243..487b656c9c 100644
--- a/docs/document-extensions/attachments/indexing.mdx
+++ b/docs/document-extensions/attachments/indexing.mdx
@@ -31,8 +31,8 @@ export const supportedLanguages = ["csharp", "java", "python", "php", "nodejs"];
 
 * In this page:
     * [Index attachments details](../../document-extensions/attachments/indexing.mdx#index-attachments-details)
-    * [Index details & content - by attachment name](../../document-extensions/attachments/indexing.mdx#index-details-&-content---by-attachment-name)
-    * [Index details & content - all attachments](../../document-extensions/attachments/indexing.mdx#index-details-&-content---all-attachments)
+    * [Index details & content - by attachment name](../../document-extensions/attachments/indexing.mdx#index-details--content---by-attachment-name)
+    * [Index details & content - all attachments](../../document-extensions/attachments/indexing.mdx#index-details--content---all-attachments)
     * [Leveraging indexed attachments](../../document-extensions/attachments/indexing.mdx#leveraging-indexed-attachments)
     * [Syntax](../../document-extensions/attachments/indexing.mdx#syntax)
 
@@ -47,7 +47,7 @@ export const supportedLanguages = ["csharp", "java", "python", "php", "nodejs"];
   These details can then be used when defining the index-fields.
   Once the index is deployed, you can query the index to find Employee documents based on these attachment properties.
 
-* To index **attachments' content**, see the examples [below](../../document-extensions/attachments/indexing.mdx#index-details-&-content---by-attachment-name).
+* To index **attachments' content**, see the examples [below](../../document-extensions/attachments/indexing.mdx#index-details--content---by-attachment-name).
 
 <Tabs groupId='languageSyntax'>
 <TabItem value="LINQ_index" label="LINQ_index">
@@ -1339,8 +1339,8 @@ $employees = $session
 
 * In this page:  
   * [Index attachments details](../../document-extensions/attachments/indexing.mdx#index-attachments-details)
-  * [Index details & content - by attachment name](../../document-extensions/attachments/indexing.mdx#index-details-&-content---by-attachment-name)
-  * [Index details & content - all attachments](../../document-extensions/attachments/indexing.mdx#index-details-&-content---all-attachments)
+  * [Index details & content - by attachment name](../../document-extensions/attachments/indexing.mdx#index-details--content---by-attachment-name)
+  * [Index details & content - all attachments](../../document-extensions/attachments/indexing.mdx#index-details--content---all-attachments)
   * [Leveraging indexed attachments](../../document-extensions/attachments/indexing.mdx#leveraging-indexed-attachments)
   * [Syntax](../../document-extensions/attachments/indexing.mdx#syntax)
 
@@ -1356,7 +1356,7 @@ $employees = $session
   These details can then be used when defining the index-fields.
   Once the index is deployed, you can query the index to find Employee documents based on these attachment properties.
 
-* To index **attachments' content**, see the examples [below](../../document-extensions/attachments/indexing.mdx#index-details-&-content---by-attachment-name).
+* To index **attachments' content**, see the examples [below](../../document-extensions/attachments/indexing.mdx#index-details--content---by-attachment-name).
 
 <TabItem value="index_1" label="index_1">
 <CodeBlock language="js">
diff --git a/docs/indexes/multi-map-indexes.mdx b/docs/indexes/multi-map-indexes.mdx
index 32e13c5096..c8aff3d301 100644
--- a/docs/indexes/multi-map-indexes.mdx
+++ b/docs/indexes/multi-map-indexes.mdx
@@ -28,7 +28,7 @@ export const supportedLanguages = ["csharp", "java", "python", "php", "nodejs"];
   Learn how to [create Multi-Map-Reduce indexes](../indexes/map-reduce-indexes.mdx#creating-multi-map-reduce-indexes)  
 
 * In this page:
-  * [AddMap & AddMapForAll](../indexes/multi-map-indexes.mdx#addmap-&-addmapforall)
+  * [AddMap & AddMapForAll](../indexes/multi-map-indexes.mdx#addmap--addmapforall)
   * [Searching across multiple collections](../indexes/multi-map-indexes.mdx#searching-across-multiple-collections)
   * [Remarks](../indexes/multi-map-indexes.mdx#remarks)
 
diff --git a/docs/indexes/using-dynamic-fields.mdx b/docs/indexes/using-dynamic-fields.mdx
index 6c5cca18ba..8f8e49760c 100644
--- a/docs/indexes/using-dynamic-fields.mdx
+++ b/docs/indexes/using-dynamic-fields.mdx
@@ -42,7 +42,7 @@ export const supportedLanguages = ["csharp", "java", "python", "php", "nodejs"];
         * [Example - basic](../indexes/using-dynamic-fields.mdx#example---basic)
         * [Example - list](../indexes/using-dynamic-fields.mdx#example---list)
     * [CreateField syntax](../indexes/using-dynamic-fields.mdx#createfield-syntax)
-    * [Indexed fields & terms view](../indexes/using-dynamic-fields.mdx#indexed-fields-&-terms-view)
+    * [Indexed fields & terms view](../indexes/using-dynamic-fields.mdx#indexed-fields--terms-view)
 
 </Admonition>
 
@@ -604,7 +604,7 @@ Below are sample index fields & their terms generated from the last example.
         * [Example - basic](../indexes/using-dynamic-fields.mdx#example---basic)
         * [Example - list](../indexes/using-dynamic-fields.mdx#example---list)
     * [CreateField syntax](../indexes/using-dynamic-fields.mdx#createfield-syntax)
-    * [Indexed fields & terms view](../indexes/using-dynamic-fields.mdx#indexed-fields-&-terms-view)
+    * [Indexed fields & terms view](../indexes/using-dynamic-fields.mdx#indexed-fields--terms-view)
 
 </Admonition>
 
@@ -1090,7 +1090,7 @@ Below are sample index fields & their terms generated from the last example.
         * [Example - basic](../indexes/using-dynamic-fields.mdx#example---basic)
         * [Example - list](../indexes/using-dynamic-fields.mdx#example---list)
     * [CreateField syntax](../indexes/using-dynamic-fields.mdx#createfield-syntax)
-    * [Indexed fields & terms view](../indexes/using-dynamic-fields.mdx#indexed-fields-&-terms-view)
+    * [Indexed fields & terms view](../indexes/using-dynamic-fields.mdx#indexed-fields--terms-view)
 
 </Admonition>
 
@@ -1608,7 +1608,7 @@ Below are sample index fields & their terms generated from the last example.
         * [Example - basic](../indexes/using-dynamic-fields.mdx#example---basic)
         * [Example - list](../indexes/using-dynamic-fields.mdx#example---list)
     * [CreateField syntax](../indexes/using-dynamic-fields.mdx#createfield-syntax)
-    * [Indexed fields & terms view](../indexes/using-dynamic-fields.mdx#indexed-fields-&-terms-view)
+    * [Indexed fields & terms view](../indexes/using-dynamic-fields.mdx#indexed-fields--terms-view)
 
 </Admonition>
 
@@ -2174,7 +2174,7 @@ Below are sample index fields & their terms generated from the last example.
         * [Example - basic](../indexes/using-dynamic-fields.mdx#example---basic)
         * [Example - list](../indexes/using-dynamic-fields.mdx#example---list)
     * [CreateField syntax](../indexes/using-dynamic-fields.mdx#createfield-syntax)
-    * [Indexed fields & terms view](../indexes/using-dynamic-fields.mdx#indexed-fields-&-terms-view)
+    * [Indexed fields & terms view](../indexes/using-dynamic-fields.mdx#indexed-fields--terms-view)
 
 </Admonition>
 
diff --git a/docs/server/clustering/distribution/cluster-observer.mdx b/docs/server/clustering/distribution/cluster-observer.mdx
index 26b0c8cdc6..f9135f66a7 100644
--- a/docs/server/clustering/distribution/cluster-observer.mdx
+++ b/docs/server/clustering/distribution/cluster-observer.mdx
@@ -75,7 +75,7 @@ You can interact with the `Cluster Observer` using the following REST API calls:
 
 | URL                                 | Method  | Query Params   | Description                                                                                                                                                          |
 |-------------------------------------|---------|----------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `/admin/cluster/observer/suspend`   | POST    | value=[`bool`] | Setting `false` will suspend the _Cluster Observer_ operation for the current [Leader term](../../../studio/cluster/cluster-view.mdx#cluster-nodes-states-&-types-flow). |
+| `/admin/cluster/observer/suspend`   | POST    | value=[`bool`] | Setting `false` will suspend the _Cluster Observer_ operation for the current [Leader term](../../../studio/cluster/cluster-view.mdx#cluster-nodes-states--types-flow). |
 | `/admin/cluster/observer/decisions` | GET     |                | Fetch the log of the recent decisions made by the cluster observer.                                                                                                  |
 | `/admin/cluster/maintenance-stats`  | GET     |                | Fetch the latest reports of the _Cluster Observer_                                                                                                                   |
 
diff --git a/docs/server/clustering/distribution/distributed-database.mdx b/docs/server/clustering/distribution/distributed-database.mdx
index 932216a41e..cc736f52ee 100644
--- a/docs/server/clustering/distribution/distributed-database.mdx
+++ b/docs/server/clustering/distribution/distributed-database.mdx
@@ -75,7 +75,7 @@ Each **Database Node** can be in one of the following states:
   The new node will be in a `Promotable` state until it receives _and_ indexes all the documents from the mentor node.  
 * Learn more in:  
   * [Cluster node types](../../../studio/cluster/cluster-view.mdx#cluster-nodes-types)
-  * [Cluster node states and types flow](../../../studio/cluster/cluster-view.mdx#cluster-nodes-states-&-types-flow)
+  * [Cluster node states and types flow](../../../studio/cluster/cluster-view.mdx#cluster-nodes-states--types-flow)
 
 </Admonition>
 
diff --git a/docs/server/clustering/replication/replication-overview.mdx b/docs/server/clustering/replication/replication-overview.mdx
index 72ca81e70e..3f08dc1d67 100644
--- a/docs/server/clustering/replication/replication-overview.mdx
+++ b/docs/server/clustering/replication/replication-overview.mdx
@@ -32,7 +32,7 @@ import LanguageContent from "@site/src/components/LanguageContent";
       * [Hub/Sink replication](../../../server/clustering/replication/replication-overview.mdx#hubsink-replication)
     * [What is replicated](../../../server/clustering/replication/replication-overview.mdx#what-is-replicated)  
     * [How replication works](../../../server/clustering/replication/replication-overview.mdx#how-replication-works)  
-    * [Replication & transaction boundary](../../../server/clustering/replication/replication-overview.mdx#replication-&-transaction-boundary)  
+    * [Replication & transaction boundary](../../../server/clustering/replication/replication-overview.mdx#replication--transaction-boundary)  
 
 </Admonition>
 ## Replication types
diff --git a/docs/sharding/migration.mdx b/docs/sharding/migration.mdx
index 1b7d213fb7..1246d9bf9c 100644
--- a/docs/sharding/migration.mdx
+++ b/docs/sharding/migration.mdx
@@ -32,7 +32,7 @@ database to the new one in several ways.
   of the replica.  
 
 * In this page:  
-  * [Export & Import](../sharding/migration.mdx#export-&-import)  
+  * [Export & Import](../sharding/migration.mdx#export--import)  
   * [Backup](../sharding/migration.mdx#backup)  
   * [External Replication](../sharding/migration.mdx#external-replication)  
 
diff --git a/docs/sharding/subscriptions.mdx b/docs/sharding/subscriptions.mdx
index 3149e6480a..a56b035a6b 100644
--- a/docs/sharding/subscriptions.mdx
+++ b/docs/sharding/subscriptions.mdx
@@ -95,7 +95,7 @@ Data subscriptions features that are not supported yet under a sharded database:
   Allowing multiple workers to connect a common subscription simultaneously.  
 * [Data Subscriptions Revisions Support](../client-api/data-subscriptions/advanced-topics/subscription-with-revisioning.mdx)  
   Subscribing to document revisions.  
-* [SubscriptionCreationOptions.ChangeVector](../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptions&lt;t&gt;)  
+* [SubscriptionCreationOptions.ChangeVector](../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptionst)  
   Providing an arbitrary change vector from which the subscription would start processing 
   is currently not supported.  
   <Admonition type="note" title="">
diff --git a/docs/start/installation/setup-wizard.mdx b/docs/start/installation/setup-wizard.mdx
index ebb0528394..3b0787ba5c 100644
--- a/docs/start/installation/setup-wizard.mdx
+++ b/docs/start/installation/setup-wizard.mdx
@@ -661,7 +661,7 @@ In the **Unsecure Mode**, all you need to do is specify the **IP address** and *
                    This new cluster will only contain this node.  
    * **Unchecked** - The server will Not be created in a cluster.  
                      The server will be created in a 
-                     [Passive State](../../studio/cluster/cluster-view.mdx#cluster-nodes-states-&-types-flow) 
+                     [Passive State](../../studio/cluster/cluster-view.mdx#cluster-nodes-states--types-flow) 
                      and can later be added to an already existing cluster.  
 
 4. **Environment**  
diff --git a/docs/start/licensing/renew-license.mdx b/docs/start/licensing/renew-license.mdx
index 4de1e81a5e..e237e84d40 100644
--- a/docs/start/licensing/renew-license.mdx
+++ b/docs/start/licensing/renew-license.mdx
@@ -24,7 +24,7 @@ import LanguageContent from "@site/src/components/LanguageContent";
 
 * In this page:
     * [Renew commercial licenses](../../start/licensing/renew-license.mdx#renew-commercial-licenses)
-    * [Renew Developer & Community licenses](../../start/licensing/renew-license.mdx#renew-developer-&-community-licenses)
+    * [Renew Developer & Community licenses](../../start/licensing/renew-license.mdx#renew-developer--community-licenses)
 
 </Admonition>
 ## Renew commercial licenses
diff --git a/docs/studio/cluster/cluster-view.mdx b/docs/studio/cluster/cluster-view.mdx
index 51f7e5e122..2d539e56b5 100644
--- a/docs/studio/cluster/cluster-view.mdx
+++ b/docs/studio/cluster/cluster-view.mdx
@@ -34,7 +34,7 @@ import LanguageContent from "@site/src/components/LanguageContent";
   * [Cluster View Operations](../../studio/cluster/cluster-view.mdx#cluster-view-operations)  
   * [Reassign Cores](../../studio/cluster/cluster-view.mdx#reassign-cores)  
   * [Cluster Nodes Types](../../studio/cluster/cluster-view.mdx#cluster-nodes-types)  
-  * [Cluster Nodes States & Types Flow](../../studio/cluster/cluster-view.mdx#cluster-nodes-states-&-types-flow)  
+  * [Cluster Nodes States & Types Flow](../../studio/cluster/cluster-view.mdx#cluster-nodes-states--types-flow)  
   * [Cluster-Wide operation -vs- Database Operations](../../studio/cluster/cluster-view.mdx#cluster-wide-operation--vs--database-operations)  
 </Admonition>
 ## Cluster View Stats
diff --git a/docs/studio/database/indexes/create-map-index.mdx b/docs/studio/database/indexes/create-map-index.mdx
index f47ef2385a..db556daae3 100644
--- a/docs/studio/database/indexes/create-map-index.mdx
+++ b/docs/studio/database/indexes/create-map-index.mdx
@@ -21,7 +21,7 @@ import LanguageContent from "@site/src/components/LanguageContent";
 * In this page:  
   * [Edit Index View](../../../studio/database/indexes/create-map-index.mdx#edit-index-view)  
   * [Test Index](../../../studio/database/indexes/create-map-index.mdx#test-index)  
-  * [Index Fields & Terms](../../../studio/database/indexes/create-map-index.mdx#index-fields-&-terms)  
+  * [Index Fields & Terms](../../../studio/database/indexes/create-map-index.mdx#index-fields--terms)  
   * [Index Field Options](../../../studio/database/indexes/create-map-index.mdx#index-field-options)  
      * [Add Compound Field](../../../studio/database/indexes/create-map-index.mdx#add-compound-field)  
   * [Configuration](../../../studio/database/indexes/create-map-index.mdx#configuration)  
@@ -41,7 +41,7 @@ import LanguageContent from "@site/src/components/LanguageContent";
 2. Options available for an already saved index:  
    **Copy C#** - Click to view and copy the C# class that defines the index as set in the Studio.  
    **Query** - Click to go the the Query View and query this index.  
-   **Terms** - Click to see the index terms, see [below](../../../studio/database/indexes/create-map-index.mdx#index-fields-&-terms).  
+   **Terms** - Click to see the index terms, see [below](../../../studio/database/indexes/create-map-index.mdx#index-fields--terms).  
    **Advanced** - Click to dump the raw index or optimize it.  
    **Delete** - Delete this index.  
 
diff --git a/versioned_docs/version-4.0/client-api/data-subscriptions/consumption/api-overview.mdx b/versioned_docs/version-4.0/client-api/data-subscriptions/consumption/api-overview.mdx
index 8aa87d38c9..4da02b29c3 100644
--- a/versioned_docs/version-4.0/client-api/data-subscriptions/consumption/api-overview.mdx
+++ b/versioned_docs/version-4.0/client-api/data-subscriptions/consumption/api-overview.mdx
@@ -26,8 +26,8 @@ In this page:
 [Subscription worker generation](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscription-worker-generation)  
 [SubscriptionWorkerOptions](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworkeroptions)  
 [Running subscription worker](../../../client-api/data-subscriptions/consumption/api-overview.mdx#running-subscription-worker)  
-[SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatch&lt;t&gt;)  
-[SubscriptionWorker&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworker&lt;t&gt;)  
+[SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatcht)  
+[SubscriptionWorker&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworkert)  
 
 </Admonition>
 ## Subscription worker generation
@@ -202,8 +202,8 @@ In this page:
 [Subscription worker generation](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscription-worker-generation)  
 [SubscriptionWorkerOptions](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworkeroptions)  
 [Running subscription worker](../../../client-api/data-subscriptions/consumption/api-overview.mdx#running-subscription-worker)  
-[SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatch&lt;t&gt;)  
-[SubscriptionWorker&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworker&lt;t&gt;)  
+[SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatcht)  
+[SubscriptionWorker&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworkert)  
 
 </Admonition>
 ## Subscription worker generation
@@ -358,8 +358,8 @@ In this page:
 [Subscription worker generation](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscription-worker-generation)  
 [SubscriptionWorkerOptions](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworkeroptions)  
 [Running subscription worker](../../../client-api/data-subscriptions/consumption/api-overview.mdx#running-subscription-worker)  
-[SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatch&lt;t&gt;)  
-[SubscriptionWorker&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworker&lt;t&gt;)  
+[SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatcht)  
+[SubscriptionWorker&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworkert)  
 
 </Admonition>
 ## Subscription worker generation
diff --git a/versioned_docs/version-4.0/client-api/data-subscriptions/creation/api-overview.mdx b/versioned_docs/version-4.0/client-api/data-subscriptions/creation/api-overview.mdx
index e4324d4b74..baec68123f 100644
--- a/versioned_docs/version-4.0/client-api/data-subscriptions/creation/api-overview.mdx
+++ b/versioned_docs/version-4.0/client-api/data-subscriptions/creation/api-overview.mdx
@@ -25,7 +25,7 @@ export const supportedLanguages = ["csharp", "java", "nodejs"];
 In this page:  
 [Subscription creation overloads summary](../../../client-api/data-subscriptions/creation/api-overview.mdx#create-and-createasync-overloads-summary)  
 [Subscription Creation Options](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptions)  
-[SubscriptionCreationOptions&lt;T&gt;](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptions&lt;t&gt;)  
+[SubscriptionCreationOptions&lt;T&gt;](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptionst)  
 [Subscription query](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscription-query)  
 
 </Admonition>
diff --git a/versioned_docs/version-4.0/client-api/faq/transaction-support.mdx b/versioned_docs/version-4.0/client-api/faq/transaction-support.mdx
index cf50fc670d..feb3ea203b 100644
--- a/versioned_docs/version-4.0/client-api/faq/transaction-support.mdx
+++ b/versioned_docs/version-4.0/client-api/faq/transaction-support.mdx
@@ -174,7 +174,7 @@ If you care about avoiding lost updates, you need to ensure you have the conflic
 
 The following is an important aspect to RavenDB's transactional behavior with regards to asynchronous replication.  
 
-When replicating modifications to another server, RavenDB will ensure that the [transaction boundaries](../../server/clustering/replication/replication-overview.mdx#replication-&-transaction-boundary) are maintained.  
+When replicating modifications to another server, RavenDB will ensure that the [transaction boundaries](../../server/clustering/replication/replication-overview.mdx#replication--transaction-boundary) are maintained.  
 If there are several document modifications in the same transaction they will be sent in the same replication batch, keeping the transaction boundary on the destination as well.  
 
 However, a special attention is needed when a document is modified in two separate transactions but the replication of the first transaction has not occurred yet. 
diff --git a/versioned_docs/version-4.0/server/clustering/distribution/cluster-observer.mdx b/versioned_docs/version-4.0/server/clustering/distribution/cluster-observer.mdx
index 0e84800dfc..418be9ff4a 100644
--- a/versioned_docs/version-4.0/server/clustering/distribution/cluster-observer.mdx
+++ b/versioned_docs/version-4.0/server/clustering/distribution/cluster-observer.mdx
@@ -43,7 +43,7 @@ The _Cluster Observer_ stores its information **in memory**, so when the `Leader
 
 | URL | Method | Query Params. | Description |
 | - | - | - | - |
-| `/admin/cluster/observer/suspend` | POST | value=[`bool`] | Setting `false` will suspend the _Cluster Observer_ operation for the current [Leader term](../../../studio/server/cluster/cluster-view.mdx#cluster-nodes-states-&-types-flow). |
+| `/admin/cluster/observer/suspend` | POST | value=[`bool`] | Setting `false` will suspend the _Cluster Observer_ operation for the current [Leader term](../../../studio/server/cluster/cluster-view.mdx#cluster-nodes-states--types-flow). |
 | `/admin/cluster/observer/decisions` | GET | | Fetch the log of the recent decisions made by the cluster observer. |
 | `/admin/cluster/maintenance-stats` | GET | | Fetch the latest reports of the _Cluster Observer_ |
 
diff --git a/versioned_docs/version-4.0/server/ongoing-tasks/etl/raven.mdx b/versioned_docs/version-4.0/server/ongoing-tasks/etl/raven.mdx
index 10890023d1..f19b26a461 100644
--- a/versioned_docs/version-4.0/server/ongoing-tasks/etl/raven.mdx
+++ b/versioned_docs/version-4.0/server/ongoing-tasks/etl/raven.mdx
@@ -28,7 +28,7 @@ import LanguageContent from "@site/src/components/LanguageContent";
 * In this page:  
   * [Transformation Script Options](../../../server/ongoing-tasks/etl/raven.mdx#transformation-script-options)  
   * [Empty Script](../../../server/ongoing-tasks/etl/raven.mdx#empty-script)  
-  * [Attachments & Revisions](../../../server/ongoing-tasks/etl/raven.mdx#attachments-&-revisions)  
+  * [Attachments & Revisions](../../../server/ongoing-tasks/etl/raven.mdx#attachments--revisions)  
   * [Deletions](../../../server/ongoing-tasks/etl/raven.mdx#deletions)  
   * [Example](../../../server/ongoing-tasks/etl/raven.mdx#example)  
 </Admonition>
diff --git a/versioned_docs/version-4.0/studio/database/indexes/create-map-index.mdx b/versioned_docs/version-4.0/studio/database/indexes/create-map-index.mdx
index e00feefa24..b1cdd959fd 100644
--- a/versioned_docs/version-4.0/studio/database/indexes/create-map-index.mdx
+++ b/versioned_docs/version-4.0/studio/database/indexes/create-map-index.mdx
@@ -19,7 +19,7 @@ import LanguageContent from "@site/src/components/LanguageContent";
 
 * In this page:  
   * [Edit Index View](../../../studio/database/indexes/create-map-index.mdx#edit-index-view)  
-  * [Index Fields & Terms](../../../studio/database/indexes/create-map-index.mdx#index-fields-&-terms)  
+  * [Index Fields & Terms](../../../studio/database/indexes/create-map-index.mdx#index-fields--terms)  
   * [Index Field Options](../../../studio/database/indexes/create-map-index.mdx#index-field-options)  
   * [Configuration](../../../studio/database/indexes/create-map-index.mdx#configuration)  
   * [Additional Sources](../../../studio/database/indexes/create-map-index.mdx#additional-sources)  
@@ -38,7 +38,7 @@ import LanguageContent from "@site/src/components/LanguageContent";
 3. Options avaliable for an already saved index:  
    **Copy C#** - Click to view and copy the C# class that defines the index as set in the Studio.  
    **Query** - Click to go the the Query View and query this index.  
-   **Terms** - Click to see the index terms, see [below](../../../studio/database/indexes/create-map-index.mdx#index-entries-&-terms).  
+   **Terms** - Click to see the index terms, see [below](../../../studio/database/indexes/create-map-index.mdx#index-entries--terms).  
 
 4. **The Map Function** of the index.  
 
diff --git a/versioned_docs/version-4.0/studio/database/tasks/ongoing-tasks/backup-task.mdx b/versioned_docs/version-4.0/studio/database/tasks/ongoing-tasks/backup-task.mdx
index 1042a5048e..6183217c4e 100644
--- a/versioned_docs/version-4.0/studio/database/tasks/ongoing-tasks/backup-task.mdx
+++ b/versioned_docs/version-4.0/studio/database/tasks/ongoing-tasks/backup-task.mdx
@@ -28,7 +28,7 @@ import LanguageContent from "@site/src/components/LanguageContent";
 
 * In this page:  
   * [Backup Task - Definition](../../../../studio/database/tasks/ongoing-tasks/backup-task.mdx#backup-task---definition)  
-  * [Backup Task - Scheduling](../../../../studio/database/tasks/ongoing-tasks/backup-task.mdx#backup-task---content-&-scheduling)  
+  * [Backup Task - Scheduling](../../../../studio/database/tasks/ongoing-tasks/backup-task.mdx#backup-task---content--scheduling)  
   * [Backup Task - Destination](../../../../studio/database/tasks/ongoing-tasks/backup-task.mdx#backup-task---destination)  
   * [Backup Task - Details in Tasks List View](../../../../studio/database/tasks/ongoing-tasks/backup-task.mdx#backup-task---details-in-tasks-list-view)  
   * [Backup Task - When Cluster or Node are Down](../../../../studio/database/tasks/ongoing-tasks/backup-task.mdx#backup-task---when-cluster-or-node-are-down)  
diff --git a/versioned_docs/version-4.0/studio/server/cluster/cluster-view.mdx b/versioned_docs/version-4.0/studio/server/cluster/cluster-view.mdx
index 2d3c0255ee..d16ae7bb18 100644
--- a/versioned_docs/version-4.0/studio/server/cluster/cluster-view.mdx
+++ b/versioned_docs/version-4.0/studio/server/cluster/cluster-view.mdx
@@ -33,7 +33,7 @@ import LanguageContent from "@site/src/components/LanguageContent";
   * [Cluster View Stats](../../server/cluster/cluster-view.mdx#cluster-view-stats)  
   * [Cluster View Operations](../../server/cluster/cluster-view.mdx#cluster-view-operations)  
   * [Cluster Nodes Types](../../server/cluster/cluster-view.mdx#cluster-nodes-types)  
-  * [Cluster Nodes States & Types Flow](../../server/cluster/cluster-view.mdx#cluster-nodes-states-&-types-flow)  
+  * [Cluster Nodes States & Types Flow](../../server/cluster/cluster-view.mdx#cluster-nodes-states--types-flow)  
   * [Cluster-Wide operation -vs- Database Operations](../../server/cluster/cluster-view.mdx#cluster-wide-operation--vs--database-operations)  
 </Admonition>
 ## Cluster View Stats
diff --git a/versioned_docs/version-4.1/client-api/data-subscriptions/consumption/api-overview.mdx b/versioned_docs/version-4.1/client-api/data-subscriptions/consumption/api-overview.mdx
index 4810780f98..c89abb4e48 100644
--- a/versioned_docs/version-4.1/client-api/data-subscriptions/consumption/api-overview.mdx
+++ b/versioned_docs/version-4.1/client-api/data-subscriptions/consumption/api-overview.mdx
@@ -26,8 +26,8 @@ In this page:
 [Subscription worker generation](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscription-worker-generation)  
 [SubscriptionWorkerOptions](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworkeroptions)  
 [Running subscription worker](../../../client-api/data-subscriptions/consumption/api-overview.mdx#running-subscription-worker)  
-[SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatch&lt;t&gt;)  
-[SubscriptionWorker&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworker&lt;t&gt;)  
+[SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatcht)  
+[SubscriptionWorker&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworkert)  
 
 </Admonition>
 ## Subscription worker generation
@@ -221,8 +221,8 @@ In this page:
 [Subscription worker generation](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscription-worker-generation)  
 [SubscriptionWorkerOptions](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworkeroptions)  
 [Running subscription worker](../../../client-api/data-subscriptions/consumption/api-overview.mdx#running-subscription-worker)  
-[SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatch&lt;t&gt;)  
-[SubscriptionWorker&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworker&lt;t&gt;)  
+[SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatcht)  
+[SubscriptionWorker&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworkert)  
 
 </Admonition>
 ## Subscription worker generation
diff --git a/versioned_docs/version-4.1/client-api/data-subscriptions/consumption/examples.mdx b/versioned_docs/version-4.1/client-api/data-subscriptions/consumption/examples.mdx
index 0588a343d8..a504bc98f6 100644
--- a/versioned_docs/version-4.1/client-api/data-subscriptions/consumption/examples.mdx
+++ b/versioned_docs/version-4.1/client-api/data-subscriptions/consumption/examples.mdx
@@ -291,7 +291,7 @@ _ = subscriptionWorker.Run(batch =>
 ## Subscription that uses included documents
 
 Here we create a subscription utilizing the includes feature, by processing `Order` documents and including all `Product`s of each order.  
-When processing the subscription, we create a session using the [SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatch&lt;t&gt;) object, 
+When processing the subscription, we create a session using the [SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatcht) object, 
 and for each order line, we obtain the `Product` document and process it alongside with the `Order`.
 
 <TabItem value="subscription_with_includes_path_usage" label="subscription_with_includes_path_usage">
@@ -644,7 +644,7 @@ subscriptionWorker.run(batch -> \{
 ## Subscription that uses included documents
 
 Here we create a subscription utilizing the includes feature, by processing `Order` documents and including all `Product`s of each order.  
-When processing the subscription, we create a session using the [SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatch&lt;t&gt;) object, 
+When processing the subscription, we create a session using the [SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatcht) object, 
 and for each order line, we obtain the `Product` document and process it alongside with the `Order`.
 
 <TabItem value="subscription_with_includes_path_usage" label="subscription_with_includes_path_usage">
diff --git a/versioned_docs/version-4.1/client-api/data-subscriptions/creation/api-overview.mdx b/versioned_docs/version-4.1/client-api/data-subscriptions/creation/api-overview.mdx
index 5fd4427230..ec5e0fc13a 100644
--- a/versioned_docs/version-4.1/client-api/data-subscriptions/creation/api-overview.mdx
+++ b/versioned_docs/version-4.1/client-api/data-subscriptions/creation/api-overview.mdx
@@ -25,7 +25,7 @@ export const supportedLanguages = ["csharp", "java"];
 In this page:  
 [Subscription creation overloads summary](../../../client-api/data-subscriptions/creation/api-overview.mdx#create-and-createasync-overloads-summary)  
 [Subscription Creation Options](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptions)  
-[SubscriptionCreationOptions&lt;T&gt;](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptions&lt;t&gt;)  
+[SubscriptionCreationOptions&lt;T&gt;](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptionst)  
 [Subscription query](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscription-query)  
 
 </Admonition>
diff --git a/versioned_docs/version-4.1/client-api/faq/transaction-support.mdx b/versioned_docs/version-4.1/client-api/faq/transaction-support.mdx
index cf50fc670d..feb3ea203b 100644
--- a/versioned_docs/version-4.1/client-api/faq/transaction-support.mdx
+++ b/versioned_docs/version-4.1/client-api/faq/transaction-support.mdx
@@ -174,7 +174,7 @@ If you care about avoiding lost updates, you need to ensure you have the conflic
 
 The following is an important aspect to RavenDB's transactional behavior with regards to asynchronous replication.  
 
-When replicating modifications to another server, RavenDB will ensure that the [transaction boundaries](../../server/clustering/replication/replication-overview.mdx#replication-&-transaction-boundary) are maintained.  
+When replicating modifications to another server, RavenDB will ensure that the [transaction boundaries](../../server/clustering/replication/replication-overview.mdx#replication--transaction-boundary) are maintained.  
 If there are several document modifications in the same transaction they will be sent in the same replication batch, keeping the transaction boundary on the destination as well.  
 
 However, a special attention is needed when a document is modified in two separate transactions but the replication of the first transaction has not occurred yet. 
diff --git a/versioned_docs/version-4.1/server/clustering/distribution/cluster-observer.mdx b/versioned_docs/version-4.1/server/clustering/distribution/cluster-observer.mdx
index 0e84800dfc..418be9ff4a 100644
--- a/versioned_docs/version-4.1/server/clustering/distribution/cluster-observer.mdx
+++ b/versioned_docs/version-4.1/server/clustering/distribution/cluster-observer.mdx
@@ -43,7 +43,7 @@ The _Cluster Observer_ stores its information **in memory**, so when the `Leader
 
 | URL | Method | Query Params. | Description |
 | - | - | - | - |
-| `/admin/cluster/observer/suspend` | POST | value=[`bool`] | Setting `false` will suspend the _Cluster Observer_ operation for the current [Leader term](../../../studio/server/cluster/cluster-view.mdx#cluster-nodes-states-&-types-flow). |
+| `/admin/cluster/observer/suspend` | POST | value=[`bool`] | Setting `false` will suspend the _Cluster Observer_ operation for the current [Leader term](../../../studio/server/cluster/cluster-view.mdx#cluster-nodes-states--types-flow). |
 | `/admin/cluster/observer/decisions` | GET | | Fetch the log of the recent decisions made by the cluster observer. |
 | `/admin/cluster/maintenance-stats` | GET | | Fetch the latest reports of the _Cluster Observer_ |
 
diff --git a/versioned_docs/version-4.1/start/installation/setup-wizard.mdx b/versioned_docs/version-4.1/start/installation/setup-wizard.mdx
index 5553997d76..426c39b14e 100644
--- a/versioned_docs/version-4.1/start/installation/setup-wizard.mdx
+++ b/versioned_docs/version-4.1/start/installation/setup-wizard.mdx
@@ -344,7 +344,7 @@ In the **Unsecure Mode**, all you need to do is specify the **IP address** and *
    * **Checked** - The server will be created within a cluster with the specified Node Tag.  
                    This new cluster will only contain this node.  
    * **Unchecked** - The server will Not be created in a cluster.  
-                     The server will be created in a [Passive State](../../studio/server/cluster/cluster-view.mdx#cluster-nodes-states-&-types-flow) and can later be added to an already existing cluster.  
+                     The server will be created in a [Passive State](../../studio/server/cluster/cluster-view.mdx#cluster-nodes-states--types-flow) and can later be added to an already existing cluster.  
 
 4. **Environment**  
    This option only shows when creating a new cluster.  
diff --git a/versioned_docs/version-4.1/studio/database/indexes/create-map-index.mdx b/versioned_docs/version-4.1/studio/database/indexes/create-map-index.mdx
index d03e640227..04eb84c2f1 100644
--- a/versioned_docs/version-4.1/studio/database/indexes/create-map-index.mdx
+++ b/versioned_docs/version-4.1/studio/database/indexes/create-map-index.mdx
@@ -19,7 +19,7 @@ import LanguageContent from "@site/src/components/LanguageContent";
 
 * In this page:  
   * [Edit Index View](../../../studio/database/indexes/create-map-index.mdx#edit-index-view)  
-  * [Index Fields & Terms](../../../studio/database/indexes/create-map-index.mdx#index-fields-&-terms)  
+  * [Index Fields & Terms](../../../studio/database/indexes/create-map-index.mdx#index-fields--terms)  
   * [Index Field Options](../../../studio/database/indexes/create-map-index.mdx#index-field-options)  
   * [Configuration](../../../studio/database/indexes/create-map-index.mdx#configuration)  
   * [Additional Sources](../../../studio/database/indexes/create-map-index.mdx#additional-sources)  
@@ -42,7 +42,7 @@ import LanguageContent from "@site/src/components/LanguageContent";
 3. Options available for an already saved index:  
    **Copy C#** - Click to view and copy the C# class that defines the index as set in the Studio.  
    **Query** - Click to go to the Query View and query this index.  
-   **Terms** - Click to see the index terms, see [below](../../../studio/database/indexes/create-map-index.mdx#index-entries-&-terms).  
+   **Terms** - Click to see the index terms, see [below](../../../studio/database/indexes/create-map-index.mdx#index-entries--terms).  
 
 4. **The Map Function** of the index.  
 
diff --git a/versioned_docs/version-4.1/studio/database/tasks/ongoing-tasks/backup-task.mdx b/versioned_docs/version-4.1/studio/database/tasks/ongoing-tasks/backup-task.mdx
index 2dbca253be..c241571c94 100644
--- a/versioned_docs/version-4.1/studio/database/tasks/ongoing-tasks/backup-task.mdx
+++ b/versioned_docs/version-4.1/studio/database/tasks/ongoing-tasks/backup-task.mdx
@@ -30,7 +30,7 @@ import LanguageContent from "@site/src/components/LanguageContent";
 
 * In this page:  
   * [Backup Task - Definition](../../../../studio/database/tasks/ongoing-tasks/backup-task.mdx#backup-task---definition)  
-  * [Backup Task - Scheduling](../../../../studio/database/tasks/ongoing-tasks/backup-task.mdx#backup-task---content-&-scheduling)  
+  * [Backup Task - Scheduling](../../../../studio/database/tasks/ongoing-tasks/backup-task.mdx#backup-task---content--scheduling)  
   * [Backup Task - Destination](../../../../studio/database/tasks/ongoing-tasks/backup-task.mdx#backup-task---destination)  
   * [Backup Task - Details in Tasks List View](../../../../studio/database/tasks/ongoing-tasks/backup-task.mdx#backup-task---details-in-tasks-list-view)  
   * [Backup Task - When Cluster or Node are Down](../../../../studio/database/tasks/ongoing-tasks/backup-task.mdx#backup-task---when-cluster-or-node-are-down)  
diff --git a/versioned_docs/version-4.1/studio/server/cluster/cluster-view.mdx b/versioned_docs/version-4.1/studio/server/cluster/cluster-view.mdx
index 2d3c0255ee..d16ae7bb18 100644
--- a/versioned_docs/version-4.1/studio/server/cluster/cluster-view.mdx
+++ b/versioned_docs/version-4.1/studio/server/cluster/cluster-view.mdx
@@ -33,7 +33,7 @@ import LanguageContent from "@site/src/components/LanguageContent";
   * [Cluster View Stats](../../server/cluster/cluster-view.mdx#cluster-view-stats)  
   * [Cluster View Operations](../../server/cluster/cluster-view.mdx#cluster-view-operations)  
   * [Cluster Nodes Types](../../server/cluster/cluster-view.mdx#cluster-nodes-types)  
-  * [Cluster Nodes States & Types Flow](../../server/cluster/cluster-view.mdx#cluster-nodes-states-&-types-flow)  
+  * [Cluster Nodes States & Types Flow](../../server/cluster/cluster-view.mdx#cluster-nodes-states--types-flow)  
   * [Cluster-Wide operation -vs- Database Operations](../../server/cluster/cluster-view.mdx#cluster-wide-operation--vs--database-operations)  
 </Admonition>
 ## Cluster View Stats
diff --git a/versioned_docs/version-4.2/client-api/data-subscriptions/consumption/api-overview.mdx b/versioned_docs/version-4.2/client-api/data-subscriptions/consumption/api-overview.mdx
index 0f953f3822..e8bb6532df 100644
--- a/versioned_docs/version-4.2/client-api/data-subscriptions/consumption/api-overview.mdx
+++ b/versioned_docs/version-4.2/client-api/data-subscriptions/consumption/api-overview.mdx
@@ -26,8 +26,8 @@ In this page:
 [Subscription worker generation](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscription-worker-generation)  
 [SubscriptionWorkerOptions](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworkeroptions)  
 [Running subscription worker](../../../client-api/data-subscriptions/consumption/api-overview.mdx#running-subscription-worker)  
-[SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatch&lt;t&gt;)  
-[SubscriptionWorker&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworker&lt;t&gt;)  
+[SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatcht)  
+[SubscriptionWorker&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworkert)  
 
 </Admonition>
 ## Subscription worker generation
@@ -223,8 +223,8 @@ In this page:
 [Subscription worker generation](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscription-worker-generation)  
 [SubscriptionWorkerOptions](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworkeroptions)  
 [Running subscription worker](../../../client-api/data-subscriptions/consumption/api-overview.mdx#running-subscription-worker)  
-[SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatch&lt;t&gt;)  
-[SubscriptionWorker&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworker&lt;t&gt;)  
+[SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatcht)  
+[SubscriptionWorker&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworkert)  
 
 </Admonition>
 ## Subscription worker generation
diff --git a/versioned_docs/version-4.2/client-api/data-subscriptions/consumption/examples.mdx b/versioned_docs/version-4.2/client-api/data-subscriptions/consumption/examples.mdx
index 9d5c7e1781..7e60e01de8 100644
--- a/versioned_docs/version-4.2/client-api/data-subscriptions/consumption/examples.mdx
+++ b/versioned_docs/version-4.2/client-api/data-subscriptions/consumption/examples.mdx
@@ -310,7 +310,7 @@ _ = subscriptionWorker.Run(batch =>
 ## Subscription that uses included documents
 
 Here we create a subscription utilizing the includes feature, by processing `Order` documents and including all `Product`s of each order.  
-When processing the subscription, we create a session using the [SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatch&lt;t&gt;) object, 
+When processing the subscription, we create a session using the [SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatcht) object, 
 and for each order line, we obtain the `Product` document and process it alongside with the `Order`.
 
 <TabItem value="subscription_with_includes_path_usage" label="subscription_with_includes_path_usage">
@@ -662,7 +662,7 @@ subscriptionWorker.run(batch -> \{
 ## Subscription that uses included documents
 
 Here we create a subscription utilizing the includes feature, by processing `Order` documents and including all `Product`s of each order.  
-When processing the subscription, we create a session using the [SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatch&lt;t&gt;) object, 
+When processing the subscription, we create a session using the [SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatcht) object, 
 and for each order line, we obtain the `Product` document and process it alongside with the `Order`.
 
 <TabItem value="subscription_with_includes_path_usage" label="subscription_with_includes_path_usage">
diff --git a/versioned_docs/version-4.2/client-api/data-subscriptions/creation/api-overview.mdx b/versioned_docs/version-4.2/client-api/data-subscriptions/creation/api-overview.mdx
index b74c7d6bfb..a7e13ff283 100644
--- a/versioned_docs/version-4.2/client-api/data-subscriptions/creation/api-overview.mdx
+++ b/versioned_docs/version-4.2/client-api/data-subscriptions/creation/api-overview.mdx
@@ -25,7 +25,7 @@ export const supportedLanguages = ["csharp"];
 In this page:  
 [Subscription creation overloads summary](../../../client-api/data-subscriptions/creation/api-overview.mdx#create-and-createasync-overloads-summary)  
 [Subscription Creation Options](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptions)  
-[SubscriptionCreationOptions&lt;T&gt;](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptions&lt;t&gt;)  
+[SubscriptionCreationOptions&lt;T&gt;](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptionst)  
 [Subscription query](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscription-query)  
 
 </Admonition>
diff --git a/versioned_docs/version-4.2/client-api/faq/transaction-support.mdx b/versioned_docs/version-4.2/client-api/faq/transaction-support.mdx
index cf50fc670d..feb3ea203b 100644
--- a/versioned_docs/version-4.2/client-api/faq/transaction-support.mdx
+++ b/versioned_docs/version-4.2/client-api/faq/transaction-support.mdx
@@ -174,7 +174,7 @@ If you care about avoiding lost updates, you need to ensure you have the conflic
 
 The following is an important aspect to RavenDB's transactional behavior with regards to asynchronous replication.  
 
-When replicating modifications to another server, RavenDB will ensure that the [transaction boundaries](../../server/clustering/replication/replication-overview.mdx#replication-&-transaction-boundary) are maintained.  
+When replicating modifications to another server, RavenDB will ensure that the [transaction boundaries](../../server/clustering/replication/replication-overview.mdx#replication--transaction-boundary) are maintained.  
 If there are several document modifications in the same transaction they will be sent in the same replication batch, keeping the transaction boundary on the destination as well.  
 
 However, a special attention is needed when a document is modified in two separate transactions but the replication of the first transaction has not occurred yet. 
diff --git a/versioned_docs/version-4.2/server/clustering/distribution/cluster-observer.mdx b/versioned_docs/version-4.2/server/clustering/distribution/cluster-observer.mdx
index d62b0399b8..f78ae96c9b 100644
--- a/versioned_docs/version-4.2/server/clustering/distribution/cluster-observer.mdx
+++ b/versioned_docs/version-4.2/server/clustering/distribution/cluster-observer.mdx
@@ -42,7 +42,7 @@ The _Cluster Observer_ stores its information **in memory**, so when the `Leader
 
 | URL | Method | Query Params. | Description |
 | - | - | - | - |
-| `/admin/cluster/observer/suspend` | POST | value=[`bool`] | Setting `false` will suspend the _Cluster Observer_ operation for the current [Leader term](../../../studio/server/cluster/cluster-view.mdx#cluster-nodes-states-&-types-flow). |
+| `/admin/cluster/observer/suspend` | POST | value=[`bool`] | Setting `false` will suspend the _Cluster Observer_ operation for the current [Leader term](../../../studio/server/cluster/cluster-view.mdx#cluster-nodes-states--types-flow). |
 | `/admin/cluster/observer/decisions` | GET | | Fetch the log of the recent decisions made by the cluster observer. |
 | `/admin/cluster/maintenance-stats` | GET | | Fetch the latest reports of the _Cluster Observer_ |
 
diff --git a/versioned_docs/version-4.2/start/installation/setup-wizard.mdx b/versioned_docs/version-4.2/start/installation/setup-wizard.mdx
index 5553997d76..426c39b14e 100644
--- a/versioned_docs/version-4.2/start/installation/setup-wizard.mdx
+++ b/versioned_docs/version-4.2/start/installation/setup-wizard.mdx
@@ -344,7 +344,7 @@ In the **Unsecure Mode**, all you need to do is specify the **IP address** and *
    * **Checked** - The server will be created within a cluster with the specified Node Tag.  
                    This new cluster will only contain this node.  
    * **Unchecked** - The server will Not be created in a cluster.  
-                     The server will be created in a [Passive State](../../studio/server/cluster/cluster-view.mdx#cluster-nodes-states-&-types-flow) and can later be added to an already existing cluster.  
+                     The server will be created in a [Passive State](../../studio/server/cluster/cluster-view.mdx#cluster-nodes-states--types-flow) and can later be added to an already existing cluster.  
 
 4. **Environment**  
    This option only shows when creating a new cluster.  
diff --git a/versioned_docs/version-4.2/studio/database/indexes/create-map-index.mdx b/versioned_docs/version-4.2/studio/database/indexes/create-map-index.mdx
index d03e640227..04eb84c2f1 100644
--- a/versioned_docs/version-4.2/studio/database/indexes/create-map-index.mdx
+++ b/versioned_docs/version-4.2/studio/database/indexes/create-map-index.mdx
@@ -19,7 +19,7 @@ import LanguageContent from "@site/src/components/LanguageContent";
 
 * In this page:  
   * [Edit Index View](../../../studio/database/indexes/create-map-index.mdx#edit-index-view)  
-  * [Index Fields & Terms](../../../studio/database/indexes/create-map-index.mdx#index-fields-&-terms)  
+  * [Index Fields & Terms](../../../studio/database/indexes/create-map-index.mdx#index-fields--terms)  
   * [Index Field Options](../../../studio/database/indexes/create-map-index.mdx#index-field-options)  
   * [Configuration](../../../studio/database/indexes/create-map-index.mdx#configuration)  
   * [Additional Sources](../../../studio/database/indexes/create-map-index.mdx#additional-sources)  
@@ -42,7 +42,7 @@ import LanguageContent from "@site/src/components/LanguageContent";
 3. Options available for an already saved index:  
    **Copy C#** - Click to view and copy the C# class that defines the index as set in the Studio.  
    **Query** - Click to go to the Query View and query this index.  
-   **Terms** - Click to see the index terms, see [below](../../../studio/database/indexes/create-map-index.mdx#index-entries-&-terms).  
+   **Terms** - Click to see the index terms, see [below](../../../studio/database/indexes/create-map-index.mdx#index-entries--terms).  
 
 4. **The Map Function** of the index.  
 
diff --git a/versioned_docs/version-4.2/studio/database/tasks/ongoing-tasks/backup-task.mdx b/versioned_docs/version-4.2/studio/database/tasks/ongoing-tasks/backup-task.mdx
index d8c0df5063..53927f1e9d 100644
--- a/versioned_docs/version-4.2/studio/database/tasks/ongoing-tasks/backup-task.mdx
+++ b/versioned_docs/version-4.2/studio/database/tasks/ongoing-tasks/backup-task.mdx
@@ -31,7 +31,7 @@ import LanguageContent from "@site/src/components/LanguageContent";
 
 * In this page:  
   * [Backup Task - Definition](../../../../studio/database/tasks/ongoing-tasks/backup-task.mdx#backup-task---definition)  
-  * [Backup Task - Scheduling](../../../../studio/database/tasks/ongoing-tasks/backup-task.mdx#backup-task---content-&-scheduling)  
+  * [Backup Task - Scheduling](../../../../studio/database/tasks/ongoing-tasks/backup-task.mdx#backup-task---content--scheduling)  
   * [Backup Task - Retention Policy](../../../../studio/database/tasks/ongoing-tasks/backup-task.mdx#backup-task---retention-policy)  
   * [Backup Task - Destination](../../../../studio/database/tasks/ongoing-tasks/backup-task.mdx#backup-task---destination)  
   * [Backup Task - Details in Tasks List View](../../../../studio/database/tasks/ongoing-tasks/backup-task.mdx#backup-task---details-in-tasks-list-view)  
diff --git a/versioned_docs/version-4.2/studio/server/cluster/cluster-view.mdx b/versioned_docs/version-4.2/studio/server/cluster/cluster-view.mdx
index f4ba4fe4ef..2683412fa1 100644
--- a/versioned_docs/version-4.2/studio/server/cluster/cluster-view.mdx
+++ b/versioned_docs/version-4.2/studio/server/cluster/cluster-view.mdx
@@ -34,7 +34,7 @@ import LanguageContent from "@site/src/components/LanguageContent";
   * [Cluster View Operations](../../../studio/server/cluster/cluster-view.mdx#cluster-view-operations)  
   * [Reassign Cores](../../../studio/server/cluster/cluster-view.mdx#reassign-cores)  
   * [Cluster Nodes Types](../../../studio/server/cluster/cluster-view.mdx#cluster-nodes-types)  
-  * [Cluster Nodes States & Types Flow](../../../studio/server/cluster/cluster-view.mdx#cluster-nodes-states-&-types-flow)  
+  * [Cluster Nodes States & Types Flow](../../../studio/server/cluster/cluster-view.mdx#cluster-nodes-states--types-flow)  
   * [Cluster-Wide operation -vs- Database Operations](../../../studio/server/cluster/cluster-view.mdx#cluster-wide-operation--vs--database-operations)  
 </Admonition>
 ## Cluster View Stats
diff --git a/versioned_docs/version-5.0/client-api/data-subscriptions/consumption/api-overview.mdx b/versioned_docs/version-5.0/client-api/data-subscriptions/consumption/api-overview.mdx
index 0f953f3822..e8bb6532df 100644
--- a/versioned_docs/version-5.0/client-api/data-subscriptions/consumption/api-overview.mdx
+++ b/versioned_docs/version-5.0/client-api/data-subscriptions/consumption/api-overview.mdx
@@ -26,8 +26,8 @@ In this page:
 [Subscription worker generation](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscription-worker-generation)  
 [SubscriptionWorkerOptions](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworkeroptions)  
 [Running subscription worker](../../../client-api/data-subscriptions/consumption/api-overview.mdx#running-subscription-worker)  
-[SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatch&lt;t&gt;)  
-[SubscriptionWorker&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworker&lt;t&gt;)  
+[SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatcht)  
+[SubscriptionWorker&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworkert)  
 
 </Admonition>
 ## Subscription worker generation
@@ -223,8 +223,8 @@ In this page:
 [Subscription worker generation](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscription-worker-generation)  
 [SubscriptionWorkerOptions](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworkeroptions)  
 [Running subscription worker](../../../client-api/data-subscriptions/consumption/api-overview.mdx#running-subscription-worker)  
-[SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatch&lt;t&gt;)  
-[SubscriptionWorker&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworker&lt;t&gt;)  
+[SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatcht)  
+[SubscriptionWorker&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworkert)  
 
 </Admonition>
 ## Subscription worker generation
diff --git a/versioned_docs/version-5.0/client-api/data-subscriptions/consumption/examples.mdx b/versioned_docs/version-5.0/client-api/data-subscriptions/consumption/examples.mdx
index 9d5c7e1781..7e60e01de8 100644
--- a/versioned_docs/version-5.0/client-api/data-subscriptions/consumption/examples.mdx
+++ b/versioned_docs/version-5.0/client-api/data-subscriptions/consumption/examples.mdx
@@ -310,7 +310,7 @@ _ = subscriptionWorker.Run(batch =>
 ## Subscription that uses included documents
 
 Here we create a subscription utilizing the includes feature, by processing `Order` documents and including all `Product`s of each order.  
-When processing the subscription, we create a session using the [SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatch&lt;t&gt;) object, 
+When processing the subscription, we create a session using the [SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatcht) object, 
 and for each order line, we obtain the `Product` document and process it alongside with the `Order`.
 
 <TabItem value="subscription_with_includes_path_usage" label="subscription_with_includes_path_usage">
@@ -662,7 +662,7 @@ subscriptionWorker.run(batch -> \{
 ## Subscription that uses included documents
 
 Here we create a subscription utilizing the includes feature, by processing `Order` documents and including all `Product`s of each order.  
-When processing the subscription, we create a session using the [SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatch&lt;t&gt;) object, 
+When processing the subscription, we create a session using the [SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatcht) object, 
 and for each order line, we obtain the `Product` document and process it alongside with the `Order`.
 
 <TabItem value="subscription_with_includes_path_usage" label="subscription_with_includes_path_usage">
diff --git a/versioned_docs/version-5.0/client-api/data-subscriptions/creation/api-overview.mdx b/versioned_docs/version-5.0/client-api/data-subscriptions/creation/api-overview.mdx
index 06321712fe..b8b6ec7fd6 100644
--- a/versioned_docs/version-5.0/client-api/data-subscriptions/creation/api-overview.mdx
+++ b/versioned_docs/version-5.0/client-api/data-subscriptions/creation/api-overview.mdx
@@ -24,7 +24,7 @@ export const supportedLanguages = ["csharp"];
 * In this page:  
    * [Subscription Creation Overloads Summary](../../../client-api/data-subscriptions/creation/api-overview.mdx#create-and-createasync-overloads-summary)  
    * [SubscriptionCreationOptions](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptions)  
-   * [SubscriptionCreationOptions&lt;T&gt;](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptions&lt;t&gt;)  
+   * [SubscriptionCreationOptions&lt;T&gt;](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptionst)  
    * [Update Subscription](../../../client-api/data-subscriptions/creation/api-overview.mdx#update-subscription)  
    * [SubscriptionUpdateOptions](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptionupdateoptions)  
    * [Subscription query](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscription-query)  
diff --git a/versioned_docs/version-5.0/client-api/faq/transaction-support.mdx b/versioned_docs/version-5.0/client-api/faq/transaction-support.mdx
index cf50fc670d..feb3ea203b 100644
--- a/versioned_docs/version-5.0/client-api/faq/transaction-support.mdx
+++ b/versioned_docs/version-5.0/client-api/faq/transaction-support.mdx
@@ -174,7 +174,7 @@ If you care about avoiding lost updates, you need to ensure you have the conflic
 
 The following is an important aspect to RavenDB's transactional behavior with regards to asynchronous replication.  
 
-When replicating modifications to another server, RavenDB will ensure that the [transaction boundaries](../../server/clustering/replication/replication-overview.mdx#replication-&-transaction-boundary) are maintained.  
+When replicating modifications to another server, RavenDB will ensure that the [transaction boundaries](../../server/clustering/replication/replication-overview.mdx#replication--transaction-boundary) are maintained.  
 If there are several document modifications in the same transaction they will be sent in the same replication batch, keeping the transaction boundary on the destination as well.  
 
 However, a special attention is needed when a document is modified in two separate transactions but the replication of the first transaction has not occurred yet. 
diff --git a/versioned_docs/version-5.0/server/clustering/distribution/cluster-observer.mdx b/versioned_docs/version-5.0/server/clustering/distribution/cluster-observer.mdx
index d62b0399b8..f78ae96c9b 100644
--- a/versioned_docs/version-5.0/server/clustering/distribution/cluster-observer.mdx
+++ b/versioned_docs/version-5.0/server/clustering/distribution/cluster-observer.mdx
@@ -42,7 +42,7 @@ The _Cluster Observer_ stores its information **in memory**, so when the `Leader
 
 | URL | Method | Query Params. | Description |
 | - | - | - | - |
-| `/admin/cluster/observer/suspend` | POST | value=[`bool`] | Setting `false` will suspend the _Cluster Observer_ operation for the current [Leader term](../../../studio/server/cluster/cluster-view.mdx#cluster-nodes-states-&-types-flow). |
+| `/admin/cluster/observer/suspend` | POST | value=[`bool`] | Setting `false` will suspend the _Cluster Observer_ operation for the current [Leader term](../../../studio/server/cluster/cluster-view.mdx#cluster-nodes-states--types-flow). |
 | `/admin/cluster/observer/decisions` | GET | | Fetch the log of the recent decisions made by the cluster observer. |
 | `/admin/cluster/maintenance-stats` | GET | | Fetch the latest reports of the _Cluster Observer_ |
 
diff --git a/versioned_docs/version-5.0/start/installation/setup-wizard.mdx b/versioned_docs/version-5.0/start/installation/setup-wizard.mdx
index 5553997d76..426c39b14e 100644
--- a/versioned_docs/version-5.0/start/installation/setup-wizard.mdx
+++ b/versioned_docs/version-5.0/start/installation/setup-wizard.mdx
@@ -344,7 +344,7 @@ In the **Unsecure Mode**, all you need to do is specify the **IP address** and *
    * **Checked** - The server will be created within a cluster with the specified Node Tag.  
                    This new cluster will only contain this node.  
    * **Unchecked** - The server will Not be created in a cluster.  
-                     The server will be created in a [Passive State](../../studio/server/cluster/cluster-view.mdx#cluster-nodes-states-&-types-flow) and can later be added to an already existing cluster.  
+                     The server will be created in a [Passive State](../../studio/server/cluster/cluster-view.mdx#cluster-nodes-states--types-flow) and can later be added to an already existing cluster.  
 
 4. **Environment**  
    This option only shows when creating a new cluster.  
diff --git a/versioned_docs/version-5.0/studio/database/indexes/create-map-index.mdx b/versioned_docs/version-5.0/studio/database/indexes/create-map-index.mdx
index d03e640227..04eb84c2f1 100644
--- a/versioned_docs/version-5.0/studio/database/indexes/create-map-index.mdx
+++ b/versioned_docs/version-5.0/studio/database/indexes/create-map-index.mdx
@@ -19,7 +19,7 @@ import LanguageContent from "@site/src/components/LanguageContent";
 
 * In this page:  
   * [Edit Index View](../../../studio/database/indexes/create-map-index.mdx#edit-index-view)  
-  * [Index Fields & Terms](../../../studio/database/indexes/create-map-index.mdx#index-fields-&-terms)  
+  * [Index Fields & Terms](../../../studio/database/indexes/create-map-index.mdx#index-fields--terms)  
   * [Index Field Options](../../../studio/database/indexes/create-map-index.mdx#index-field-options)  
   * [Configuration](../../../studio/database/indexes/create-map-index.mdx#configuration)  
   * [Additional Sources](../../../studio/database/indexes/create-map-index.mdx#additional-sources)  
@@ -42,7 +42,7 @@ import LanguageContent from "@site/src/components/LanguageContent";
 3. Options available for an already saved index:  
    **Copy C#** - Click to view and copy the C# class that defines the index as set in the Studio.  
    **Query** - Click to go to the Query View and query this index.  
-   **Terms** - Click to see the index terms, see [below](../../../studio/database/indexes/create-map-index.mdx#index-entries-&-terms).  
+   **Terms** - Click to see the index terms, see [below](../../../studio/database/indexes/create-map-index.mdx#index-entries--terms).  
 
 4. **The Map Function** of the index.  
 
diff --git a/versioned_docs/version-5.0/studio/database/tasks/ongoing-tasks/backup-task.mdx b/versioned_docs/version-5.0/studio/database/tasks/ongoing-tasks/backup-task.mdx
index d8c0df5063..53927f1e9d 100644
--- a/versioned_docs/version-5.0/studio/database/tasks/ongoing-tasks/backup-task.mdx
+++ b/versioned_docs/version-5.0/studio/database/tasks/ongoing-tasks/backup-task.mdx
@@ -31,7 +31,7 @@ import LanguageContent from "@site/src/components/LanguageContent";
 
 * In this page:  
   * [Backup Task - Definition](../../../../studio/database/tasks/ongoing-tasks/backup-task.mdx#backup-task---definition)  
-  * [Backup Task - Scheduling](../../../../studio/database/tasks/ongoing-tasks/backup-task.mdx#backup-task---content-&-scheduling)  
+  * [Backup Task - Scheduling](../../../../studio/database/tasks/ongoing-tasks/backup-task.mdx#backup-task---content--scheduling)  
   * [Backup Task - Retention Policy](../../../../studio/database/tasks/ongoing-tasks/backup-task.mdx#backup-task---retention-policy)  
   * [Backup Task - Destination](../../../../studio/database/tasks/ongoing-tasks/backup-task.mdx#backup-task---destination)  
   * [Backup Task - Details in Tasks List View](../../../../studio/database/tasks/ongoing-tasks/backup-task.mdx#backup-task---details-in-tasks-list-view)  
diff --git a/versioned_docs/version-5.0/studio/server/cluster/cluster-view.mdx b/versioned_docs/version-5.0/studio/server/cluster/cluster-view.mdx
index f4ba4fe4ef..2683412fa1 100644
--- a/versioned_docs/version-5.0/studio/server/cluster/cluster-view.mdx
+++ b/versioned_docs/version-5.0/studio/server/cluster/cluster-view.mdx
@@ -34,7 +34,7 @@ import LanguageContent from "@site/src/components/LanguageContent";
   * [Cluster View Operations](../../../studio/server/cluster/cluster-view.mdx#cluster-view-operations)  
   * [Reassign Cores](../../../studio/server/cluster/cluster-view.mdx#reassign-cores)  
   * [Cluster Nodes Types](../../../studio/server/cluster/cluster-view.mdx#cluster-nodes-types)  
-  * [Cluster Nodes States & Types Flow](../../../studio/server/cluster/cluster-view.mdx#cluster-nodes-states-&-types-flow)  
+  * [Cluster Nodes States & Types Flow](../../../studio/server/cluster/cluster-view.mdx#cluster-nodes-states--types-flow)  
   * [Cluster-Wide operation -vs- Database Operations](../../../studio/server/cluster/cluster-view.mdx#cluster-wide-operation--vs--database-operations)  
 </Admonition>
 ## Cluster View Stats
diff --git a/versioned_docs/version-5.1/client-api/data-subscriptions/consumption/api-overview.mdx b/versioned_docs/version-5.1/client-api/data-subscriptions/consumption/api-overview.mdx
index 0f953f3822..e8bb6532df 100644
--- a/versioned_docs/version-5.1/client-api/data-subscriptions/consumption/api-overview.mdx
+++ b/versioned_docs/version-5.1/client-api/data-subscriptions/consumption/api-overview.mdx
@@ -26,8 +26,8 @@ In this page:
 [Subscription worker generation](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscription-worker-generation)  
 [SubscriptionWorkerOptions](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworkeroptions)  
 [Running subscription worker](../../../client-api/data-subscriptions/consumption/api-overview.mdx#running-subscription-worker)  
-[SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatch&lt;t&gt;)  
-[SubscriptionWorker&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworker&lt;t&gt;)  
+[SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatcht)  
+[SubscriptionWorker&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworkert)  
 
 </Admonition>
 ## Subscription worker generation
@@ -223,8 +223,8 @@ In this page:
 [Subscription worker generation](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscription-worker-generation)  
 [SubscriptionWorkerOptions](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworkeroptions)  
 [Running subscription worker](../../../client-api/data-subscriptions/consumption/api-overview.mdx#running-subscription-worker)  
-[SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatch&lt;t&gt;)  
-[SubscriptionWorker&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworker&lt;t&gt;)  
+[SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatcht)  
+[SubscriptionWorker&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworkert)  
 
 </Admonition>
 ## Subscription worker generation
diff --git a/versioned_docs/version-5.1/client-api/data-subscriptions/consumption/examples.mdx b/versioned_docs/version-5.1/client-api/data-subscriptions/consumption/examples.mdx
index 9d5c7e1781..7e60e01de8 100644
--- a/versioned_docs/version-5.1/client-api/data-subscriptions/consumption/examples.mdx
+++ b/versioned_docs/version-5.1/client-api/data-subscriptions/consumption/examples.mdx
@@ -310,7 +310,7 @@ _ = subscriptionWorker.Run(batch =>
 ## Subscription that uses included documents
 
 Here we create a subscription utilizing the includes feature, by processing `Order` documents and including all `Product`s of each order.  
-When processing the subscription, we create a session using the [SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatch&lt;t&gt;) object, 
+When processing the subscription, we create a session using the [SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatcht) object, 
 and for each order line, we obtain the `Product` document and process it alongside with the `Order`.
 
 <TabItem value="subscription_with_includes_path_usage" label="subscription_with_includes_path_usage">
@@ -662,7 +662,7 @@ subscriptionWorker.run(batch -> \{
 ## Subscription that uses included documents
 
 Here we create a subscription utilizing the includes feature, by processing `Order` documents and including all `Product`s of each order.  
-When processing the subscription, we create a session using the [SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatch&lt;t&gt;) object, 
+When processing the subscription, we create a session using the [SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatcht) object, 
 and for each order line, we obtain the `Product` document and process it alongside with the `Order`.
 
 <TabItem value="subscription_with_includes_path_usage" label="subscription_with_includes_path_usage">
diff --git a/versioned_docs/version-5.1/client-api/data-subscriptions/creation/api-overview.mdx b/versioned_docs/version-5.1/client-api/data-subscriptions/creation/api-overview.mdx
index 06321712fe..b8b6ec7fd6 100644
--- a/versioned_docs/version-5.1/client-api/data-subscriptions/creation/api-overview.mdx
+++ b/versioned_docs/version-5.1/client-api/data-subscriptions/creation/api-overview.mdx
@@ -24,7 +24,7 @@ export const supportedLanguages = ["csharp"];
 * In this page:  
    * [Subscription Creation Overloads Summary](../../../client-api/data-subscriptions/creation/api-overview.mdx#create-and-createasync-overloads-summary)  
    * [SubscriptionCreationOptions](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptions)  
-   * [SubscriptionCreationOptions&lt;T&gt;](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptions&lt;t&gt;)  
+   * [SubscriptionCreationOptions&lt;T&gt;](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptionst)  
    * [Update Subscription](../../../client-api/data-subscriptions/creation/api-overview.mdx#update-subscription)  
    * [SubscriptionUpdateOptions](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptionupdateoptions)  
    * [Subscription query](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscription-query)  
diff --git a/versioned_docs/version-5.1/client-api/faq/transaction-support.mdx b/versioned_docs/version-5.1/client-api/faq/transaction-support.mdx
index cf50fc670d..feb3ea203b 100644
--- a/versioned_docs/version-5.1/client-api/faq/transaction-support.mdx
+++ b/versioned_docs/version-5.1/client-api/faq/transaction-support.mdx
@@ -174,7 +174,7 @@ If you care about avoiding lost updates, you need to ensure you have the conflic
 
 The following is an important aspect to RavenDB's transactional behavior with regards to asynchronous replication.  
 
-When replicating modifications to another server, RavenDB will ensure that the [transaction boundaries](../../server/clustering/replication/replication-overview.mdx#replication-&-transaction-boundary) are maintained.  
+When replicating modifications to another server, RavenDB will ensure that the [transaction boundaries](../../server/clustering/replication/replication-overview.mdx#replication--transaction-boundary) are maintained.  
 If there are several document modifications in the same transaction they will be sent in the same replication batch, keeping the transaction boundary on the destination as well.  
 
 However, a special attention is needed when a document is modified in two separate transactions but the replication of the first transaction has not occurred yet. 
diff --git a/versioned_docs/version-5.1/server/clustering/distribution/cluster-observer.mdx b/versioned_docs/version-5.1/server/clustering/distribution/cluster-observer.mdx
index d62b0399b8..f78ae96c9b 100644
--- a/versioned_docs/version-5.1/server/clustering/distribution/cluster-observer.mdx
+++ b/versioned_docs/version-5.1/server/clustering/distribution/cluster-observer.mdx
@@ -42,7 +42,7 @@ The _Cluster Observer_ stores its information **in memory**, so when the `Leader
 
 | URL | Method | Query Params. | Description |
 | - | - | - | - |
-| `/admin/cluster/observer/suspend` | POST | value=[`bool`] | Setting `false` will suspend the _Cluster Observer_ operation for the current [Leader term](../../../studio/server/cluster/cluster-view.mdx#cluster-nodes-states-&-types-flow). |
+| `/admin/cluster/observer/suspend` | POST | value=[`bool`] | Setting `false` will suspend the _Cluster Observer_ operation for the current [Leader term](../../../studio/server/cluster/cluster-view.mdx#cluster-nodes-states--types-flow). |
 | `/admin/cluster/observer/decisions` | GET | | Fetch the log of the recent decisions made by the cluster observer. |
 | `/admin/cluster/maintenance-stats` | GET | | Fetch the latest reports of the _Cluster Observer_ |
 
diff --git a/versioned_docs/version-5.1/start/installation/setup-wizard.mdx b/versioned_docs/version-5.1/start/installation/setup-wizard.mdx
index ebb0528394..3b0787ba5c 100644
--- a/versioned_docs/version-5.1/start/installation/setup-wizard.mdx
+++ b/versioned_docs/version-5.1/start/installation/setup-wizard.mdx
@@ -661,7 +661,7 @@ In the **Unsecure Mode**, all you need to do is specify the **IP address** and *
                    This new cluster will only contain this node.  
    * **Unchecked** - The server will Not be created in a cluster.  
                      The server will be created in a 
-                     [Passive State](../../studio/cluster/cluster-view.mdx#cluster-nodes-states-&-types-flow) 
+                     [Passive State](../../studio/cluster/cluster-view.mdx#cluster-nodes-states--types-flow) 
                      and can later be added to an already existing cluster.  
 
 4. **Environment**  
diff --git a/versioned_docs/version-5.1/studio/database/indexes/create-map-index.mdx b/versioned_docs/version-5.1/studio/database/indexes/create-map-index.mdx
index b92fcaee77..7859736cd6 100644
--- a/versioned_docs/version-5.1/studio/database/indexes/create-map-index.mdx
+++ b/versioned_docs/version-5.1/studio/database/indexes/create-map-index.mdx
@@ -19,7 +19,7 @@ import LanguageContent from "@site/src/components/LanguageContent";
 
 * In this page:  
   * [Edit Index View](../../../studio/database/indexes/create-map-index.mdx#edit-index-view)  
-  * [Index Fields & Terms](../../../studio/database/indexes/create-map-index.mdx#index-fields-&-terms)  
+  * [Index Fields & Terms](../../../studio/database/indexes/create-map-index.mdx#index-fields--terms)  
   * [Index Field Options](../../../studio/database/indexes/create-map-index.mdx#index-field-options)  
   * [Configuration](../../../studio/database/indexes/create-map-index.mdx#configuration)  
   * [Additional Sources](../../../studio/database/indexes/create-map-index.mdx#additional-sources)  
@@ -42,7 +42,7 @@ import LanguageContent from "@site/src/components/LanguageContent";
 3. Options available for an already saved index:  
    **Copy C#** - Click to view and copy the C# class that defines the index as set in the Studio.  
    **Query** - Click to go to the Query View and query this index.  
-   **Terms** - Click to see the index terms, see [below](../../../studio/database/indexes/create-map-index.mdx#index-entries-&-terms).  
+   **Terms** - Click to see the index terms, see [below](../../../studio/database/indexes/create-map-index.mdx#index-entries--terms).  
 
 4. **The Map Function** of the index.  
 
diff --git a/versioned_docs/version-5.1/studio/server/cluster/cluster-view.mdx b/versioned_docs/version-5.1/studio/server/cluster/cluster-view.mdx
index f4ba4fe4ef..2683412fa1 100644
--- a/versioned_docs/version-5.1/studio/server/cluster/cluster-view.mdx
+++ b/versioned_docs/version-5.1/studio/server/cluster/cluster-view.mdx
@@ -34,7 +34,7 @@ import LanguageContent from "@site/src/components/LanguageContent";
   * [Cluster View Operations](../../../studio/server/cluster/cluster-view.mdx#cluster-view-operations)  
   * [Reassign Cores](../../../studio/server/cluster/cluster-view.mdx#reassign-cores)  
   * [Cluster Nodes Types](../../../studio/server/cluster/cluster-view.mdx#cluster-nodes-types)  
-  * [Cluster Nodes States & Types Flow](../../../studio/server/cluster/cluster-view.mdx#cluster-nodes-states-&-types-flow)  
+  * [Cluster Nodes States & Types Flow](../../../studio/server/cluster/cluster-view.mdx#cluster-nodes-states--types-flow)  
   * [Cluster-Wide operation -vs- Database Operations](../../../studio/server/cluster/cluster-view.mdx#cluster-wide-operation--vs--database-operations)  
 </Admonition>
 ## Cluster View Stats
diff --git a/versioned_docs/version-5.2/client-api/data-subscriptions/consumption/api-overview.mdx b/versioned_docs/version-5.2/client-api/data-subscriptions/consumption/api-overview.mdx
index 8a1e088935..4da0447aee 100644
--- a/versioned_docs/version-5.2/client-api/data-subscriptions/consumption/api-overview.mdx
+++ b/versioned_docs/version-5.2/client-api/data-subscriptions/consumption/api-overview.mdx
@@ -26,8 +26,8 @@ In this page:
 [Subscription worker generation](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscription-worker-generation)  
 [SubscriptionWorkerOptions](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworkeroptions)  
 [Running subscription worker](../../../client-api/data-subscriptions/consumption/api-overview.mdx#running-subscription-worker)  
-[SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatch&lt;t&gt;)  
-[SubscriptionWorker&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworker&lt;t&gt;)  
+[SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatcht)  
+[SubscriptionWorker&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworkert)  
 
 </Admonition>
 ## Subscription worker generation
@@ -223,8 +223,8 @@ In this page:
 [Subscription worker generation](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscription-worker-generation)  
 [SubscriptionWorkerOptions](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworkeroptions)  
 [Running subscription worker](../../../client-api/data-subscriptions/consumption/api-overview.mdx#running-subscription-worker)  
-[SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatch&lt;t&gt;)  
-[SubscriptionWorker&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworker&lt;t&gt;)  
+[SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatcht)  
+[SubscriptionWorker&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworkert)  
 
 </Admonition>
 ## Subscription worker generation
diff --git a/versioned_docs/version-5.2/client-api/data-subscriptions/consumption/examples.mdx b/versioned_docs/version-5.2/client-api/data-subscriptions/consumption/examples.mdx
index 9d5c7e1781..7e60e01de8 100644
--- a/versioned_docs/version-5.2/client-api/data-subscriptions/consumption/examples.mdx
+++ b/versioned_docs/version-5.2/client-api/data-subscriptions/consumption/examples.mdx
@@ -310,7 +310,7 @@ _ = subscriptionWorker.Run(batch =>
 ## Subscription that uses included documents
 
 Here we create a subscription utilizing the includes feature, by processing `Order` documents and including all `Product`s of each order.  
-When processing the subscription, we create a session using the [SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatch&lt;t&gt;) object, 
+When processing the subscription, we create a session using the [SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatcht) object, 
 and for each order line, we obtain the `Product` document and process it alongside with the `Order`.
 
 <TabItem value="subscription_with_includes_path_usage" label="subscription_with_includes_path_usage">
@@ -662,7 +662,7 @@ subscriptionWorker.run(batch -> \{
 ## Subscription that uses included documents
 
 Here we create a subscription utilizing the includes feature, by processing `Order` documents and including all `Product`s of each order.  
-When processing the subscription, we create a session using the [SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatch&lt;t&gt;) object, 
+When processing the subscription, we create a session using the [SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatcht) object, 
 and for each order line, we obtain the `Product` document and process it alongside with the `Order`.
 
 <TabItem value="subscription_with_includes_path_usage" label="subscription_with_includes_path_usage">
diff --git a/versioned_docs/version-5.2/client-api/data-subscriptions/creation/api-overview.mdx b/versioned_docs/version-5.2/client-api/data-subscriptions/creation/api-overview.mdx
index 06321712fe..b8b6ec7fd6 100644
--- a/versioned_docs/version-5.2/client-api/data-subscriptions/creation/api-overview.mdx
+++ b/versioned_docs/version-5.2/client-api/data-subscriptions/creation/api-overview.mdx
@@ -24,7 +24,7 @@ export const supportedLanguages = ["csharp"];
 * In this page:  
    * [Subscription Creation Overloads Summary](../../../client-api/data-subscriptions/creation/api-overview.mdx#create-and-createasync-overloads-summary)  
    * [SubscriptionCreationOptions](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptions)  
-   * [SubscriptionCreationOptions&lt;T&gt;](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptions&lt;t&gt;)  
+   * [SubscriptionCreationOptions&lt;T&gt;](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptionst)  
    * [Update Subscription](../../../client-api/data-subscriptions/creation/api-overview.mdx#update-subscription)  
    * [SubscriptionUpdateOptions](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptionupdateoptions)  
    * [Subscription query](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscription-query)  
diff --git a/versioned_docs/version-5.2/client-api/faq/transaction-support.mdx b/versioned_docs/version-5.2/client-api/faq/transaction-support.mdx
index cf50fc670d..feb3ea203b 100644
--- a/versioned_docs/version-5.2/client-api/faq/transaction-support.mdx
+++ b/versioned_docs/version-5.2/client-api/faq/transaction-support.mdx
@@ -174,7 +174,7 @@ If you care about avoiding lost updates, you need to ensure you have the conflic
 
 The following is an important aspect to RavenDB's transactional behavior with regards to asynchronous replication.  
 
-When replicating modifications to another server, RavenDB will ensure that the [transaction boundaries](../../server/clustering/replication/replication-overview.mdx#replication-&-transaction-boundary) are maintained.  
+When replicating modifications to another server, RavenDB will ensure that the [transaction boundaries](../../server/clustering/replication/replication-overview.mdx#replication--transaction-boundary) are maintained.  
 If there are several document modifications in the same transaction they will be sent in the same replication batch, keeping the transaction boundary on the destination as well.  
 
 However, a special attention is needed when a document is modified in two separate transactions but the replication of the first transaction has not occurred yet. 
diff --git a/versioned_docs/version-5.2/client-api/session/updating-entities.mdx b/versioned_docs/version-5.2/client-api/session/updating-entities.mdx
index 4b406334dc..5c38fcf25d 100644
--- a/versioned_docs/version-5.2/client-api/session/updating-entities.mdx
+++ b/versioned_docs/version-5.2/client-api/session/updating-entities.mdx
@@ -35,8 +35,8 @@ export const supportedLanguages = ["csharp", "nodejs"];
 
 
 * In this page:
-    * [Load a document & update](../../client-api/session/updating-entities.mdx#load-a-document-&-update)
-    * [Query for documents & update](../../client-api/session/updating-entities.mdx#query-for-documents-&-update)
+    * [Load a document & update](../../client-api/session/updating-entities.mdx#load-a-document--update)
+    * [Query for documents & update](../../client-api/session/updating-entities.mdx#query-for-documents--update)
     
 </Admonition>
 ## Load a document & update
@@ -158,8 +158,8 @@ export const supportedLanguages = ["csharp", "nodejs"];
 
 
 * In this page:
-    * [Load a document & update](../../client-api/session/updating-entities.mdx#load-a-document-&-update)
-    * [Query for documents & update](../../client-api/session/updating-entities.mdx#query-for-documents-&-update)
+    * [Load a document & update](../../client-api/session/updating-entities.mdx#load-a-document--update)
+    * [Query for documents & update](../../client-api/session/updating-entities.mdx#query-for-documents--update)
 
 </Admonition>
 ## Load a document & update
diff --git a/versioned_docs/version-5.2/client-api/session/what-is-a-session-and-how-does-it-work.mdx b/versioned_docs/version-5.2/client-api/session/what-is-a-session-and-how-does-it-work.mdx
index a0e6b75c6f..ea096db22e 100644
--- a/versioned_docs/version-5.2/client-api/session/what-is-a-session-and-how-does-it-work.mdx
+++ b/versioned_docs/version-5.2/client-api/session/what-is-a-session-and-how-does-it-work.mdx
@@ -31,7 +31,7 @@ export const supportedLanguages = ["csharp", "java", "nodejs"];
       * [Create document example](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#create-document-example)
       * [Modify document example](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#modify-document-example)
   * [Identity map pattern](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#identity-map-pattern)
-  * [Batching & Transactions](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#batching-&-transactions)
+  * [Batching & Transactions](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#batching--transactions)
   * [Concurrency control](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#concurrency-control)<br/><br/>
   * [Reducing server calls (best practices) for:](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#reducing-server-calls-(best-practices)-for:)  
       * [The N+1 problem](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#the-select-n1-problem)    
@@ -377,7 +377,7 @@ To address this, the session API offers the concurrency control feature.
         * [Create document example](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#create-document-example)
         * [Modify document example](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#modify-document-example)
     * [Identity map pattern](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#identity-map-pattern)
-    * [Batching & Transactions](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#batching-&-transactions)
+    * [Batching & Transactions](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#batching--transactions)
     * [Concurrency control](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#concurrency-control)<br/><br/>
     * [Reducing server calls (best practices) for:](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#reducing-server-calls-(best-practices)-for:)
         * [The N+1 problem](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#the-select-n1-problem)
@@ -666,7 +666,7 @@ To address this, the session API offers the concurrency control feature.
         * [Create document example](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#create-document-example)
         * [Modify document example](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#modify-document-example)
     * [Identity map pattern](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#identity-map-pattern)
-    * [Batching & Transactions](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#batching-&-transactions)
+    * [Batching & Transactions](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#batching--transactions)
     * [Concurrency control](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#concurrency-control)<br/><br/>
     * [Reducing server calls (best practices) for:](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#reducing-server-calls-(best-practices)-for:)
         * [The N+1 problem](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#the-select-n1-problem)
diff --git a/versioned_docs/version-5.2/indexes/using-dynamic-fields.mdx b/versioned_docs/version-5.2/indexes/using-dynamic-fields.mdx
index 668c5b142d..1fed32ec47 100644
--- a/versioned_docs/version-5.2/indexes/using-dynamic-fields.mdx
+++ b/versioned_docs/version-5.2/indexes/using-dynamic-fields.mdx
@@ -42,7 +42,7 @@ export const supportedLanguages = ["csharp", "java", "nodejs"];
         * [Example - basic](../indexes/using-dynamic-fields.mdx#example---basic)
         * [Example - list](../indexes/using-dynamic-fields.mdx#example---list)
     * [CreateField syntax](../indexes/using-dynamic-fields.mdx#createfield-syntax)
-    * [Indexed fields & terms view](../indexes/using-dynamic-fields.mdx#indexed-fields-&-terms-view)
+    * [Indexed fields & terms view](../indexes/using-dynamic-fields.mdx#indexed-fields--terms-view)
 
 </Admonition>
 
@@ -614,7 +614,7 @@ Below are sample index fields & their terms generated from the last example.
         * [Example - basic](../indexes/using-dynamic-fields.mdx#example---basic)
         * [Example - list](../indexes/using-dynamic-fields.mdx#example---list)
     * [CreateField syntax](../indexes/using-dynamic-fields.mdx#createfield-syntax)
-    * [Indexed fields & terms view](../indexes/using-dynamic-fields.mdx#indexed-fields-&-terms-view)
+    * [Indexed fields & terms view](../indexes/using-dynamic-fields.mdx#indexed-fields--terms-view)
 
 </Admonition>
 
@@ -1112,7 +1112,7 @@ Below are sample index fields & their terms generated from the last example.
         * [Example - basic](../indexes/using-dynamic-fields.mdx#example---basic)
         * [Example - list](../indexes/using-dynamic-fields.mdx#example---list)
     * [CreateField syntax](../indexes/using-dynamic-fields.mdx#createfield-syntax)
-    * [Indexed fields & terms view](../indexes/using-dynamic-fields.mdx#indexed-fields-&-terms-view)
+    * [Indexed fields & terms view](../indexes/using-dynamic-fields.mdx#indexed-fields--terms-view)
 
 </Admonition>
 
diff --git a/versioned_docs/version-5.2/server/clustering/distribution/cluster-observer.mdx b/versioned_docs/version-5.2/server/clustering/distribution/cluster-observer.mdx
index bdae6ae0cd..5b27451f08 100644
--- a/versioned_docs/version-5.2/server/clustering/distribution/cluster-observer.mdx
+++ b/versioned_docs/version-5.2/server/clustering/distribution/cluster-observer.mdx
@@ -42,7 +42,7 @@ The _Cluster Observer_ stores its information **in memory**, so when the `Leader
 
 | URL | Method | Query Params. | Description |
 | - | - | - | - |
-| `/admin/cluster/observer/suspend` | POST | value=[`bool`] | Setting `false` will suspend the _Cluster Observer_ operation for the current [Leader term](../../../studio/cluster/cluster-view.mdx#cluster-nodes-states-&-types-flow). |
+| `/admin/cluster/observer/suspend` | POST | value=[`bool`] | Setting `false` will suspend the _Cluster Observer_ operation for the current [Leader term](../../../studio/cluster/cluster-view.mdx#cluster-nodes-states--types-flow). |
 | `/admin/cluster/observer/decisions` | GET | | Fetch the log of the recent decisions made by the cluster observer. |
 | `/admin/cluster/maintenance-stats` | GET | | Fetch the latest reports of the _Cluster Observer_ |
 
diff --git a/versioned_docs/version-5.2/server/clustering/replication/replication-overview.mdx b/versioned_docs/version-5.2/server/clustering/replication/replication-overview.mdx
index 72ca81e70e..3f08dc1d67 100644
--- a/versioned_docs/version-5.2/server/clustering/replication/replication-overview.mdx
+++ b/versioned_docs/version-5.2/server/clustering/replication/replication-overview.mdx
@@ -32,7 +32,7 @@ import LanguageContent from "@site/src/components/LanguageContent";
       * [Hub/Sink replication](../../../server/clustering/replication/replication-overview.mdx#hubsink-replication)
     * [What is replicated](../../../server/clustering/replication/replication-overview.mdx#what-is-replicated)  
     * [How replication works](../../../server/clustering/replication/replication-overview.mdx#how-replication-works)  
-    * [Replication & transaction boundary](../../../server/clustering/replication/replication-overview.mdx#replication-&-transaction-boundary)  
+    * [Replication & transaction boundary](../../../server/clustering/replication/replication-overview.mdx#replication--transaction-boundary)  
 
 </Admonition>
 ## Replication types
diff --git a/versioned_docs/version-5.2/start/installation/setup-wizard.mdx b/versioned_docs/version-5.2/start/installation/setup-wizard.mdx
index ebb0528394..3b0787ba5c 100644
--- a/versioned_docs/version-5.2/start/installation/setup-wizard.mdx
+++ b/versioned_docs/version-5.2/start/installation/setup-wizard.mdx
@@ -661,7 +661,7 @@ In the **Unsecure Mode**, all you need to do is specify the **IP address** and *
                    This new cluster will only contain this node.  
    * **Unchecked** - The server will Not be created in a cluster.  
                      The server will be created in a 
-                     [Passive State](../../studio/cluster/cluster-view.mdx#cluster-nodes-states-&-types-flow) 
+                     [Passive State](../../studio/cluster/cluster-view.mdx#cluster-nodes-states--types-flow) 
                      and can later be added to an already existing cluster.  
 
 4. **Environment**  
diff --git a/versioned_docs/version-5.2/start/licensing/renew-license.mdx b/versioned_docs/version-5.2/start/licensing/renew-license.mdx
index 31cb51d105..958e35a710 100644
--- a/versioned_docs/version-5.2/start/licensing/renew-license.mdx
+++ b/versioned_docs/version-5.2/start/licensing/renew-license.mdx
@@ -24,7 +24,7 @@ import LanguageContent from "@site/src/components/LanguageContent";
 
 * In this page:
     * [Renew commercial licenses](../../start/licensing/renew-license.mdx#renew-commercial-licenses)
-    * [Renew Developer & Community licenses](../../start/licensing/renew-license.mdx#renew-developer-&-community-licenses)
+    * [Renew Developer & Community licenses](../../start/licensing/renew-license.mdx#renew-developer--community-licenses)
 
 </Admonition>
 ## Renew commercial licenses
diff --git a/versioned_docs/version-5.2/studio/cluster/cluster-view.mdx b/versioned_docs/version-5.2/studio/cluster/cluster-view.mdx
index 51f7e5e122..2d539e56b5 100644
--- a/versioned_docs/version-5.2/studio/cluster/cluster-view.mdx
+++ b/versioned_docs/version-5.2/studio/cluster/cluster-view.mdx
@@ -34,7 +34,7 @@ import LanguageContent from "@site/src/components/LanguageContent";
   * [Cluster View Operations](../../studio/cluster/cluster-view.mdx#cluster-view-operations)  
   * [Reassign Cores](../../studio/cluster/cluster-view.mdx#reassign-cores)  
   * [Cluster Nodes Types](../../studio/cluster/cluster-view.mdx#cluster-nodes-types)  
-  * [Cluster Nodes States & Types Flow](../../studio/cluster/cluster-view.mdx#cluster-nodes-states-&-types-flow)  
+  * [Cluster Nodes States & Types Flow](../../studio/cluster/cluster-view.mdx#cluster-nodes-states--types-flow)  
   * [Cluster-Wide operation -vs- Database Operations](../../studio/cluster/cluster-view.mdx#cluster-wide-operation--vs--database-operations)  
 </Admonition>
 ## Cluster View Stats
diff --git a/versioned_docs/version-5.2/studio/database/indexes/create-map-index.mdx b/versioned_docs/version-5.2/studio/database/indexes/create-map-index.mdx
index 3c49d6b8eb..a7bc4c59b6 100644
--- a/versioned_docs/version-5.2/studio/database/indexes/create-map-index.mdx
+++ b/versioned_docs/version-5.2/studio/database/indexes/create-map-index.mdx
@@ -20,7 +20,7 @@ import LanguageContent from "@site/src/components/LanguageContent";
 
 * In this page:  
   * [Edit Index View](../../../studio/database/indexes/create-map-index.mdx#edit-index-view)  
-  * [Index Fields & Terms](../../../studio/database/indexes/create-map-index.mdx#index-fields-&-terms)  
+  * [Index Fields & Terms](../../../studio/database/indexes/create-map-index.mdx#index-fields--terms)  
   * [Index Field Options](../../../studio/database/indexes/create-map-index.mdx#index-field-options)  
   * [Configuration](../../../studio/database/indexes/create-map-index.mdx#configuration)  
   * [Additional Assemblies](../../../studio/database/indexes/create-map-index.mdx#additional-assemblies)  
@@ -39,7 +39,7 @@ import LanguageContent from "@site/src/components/LanguageContent";
 2. Options available for an already saved index:  
    **Copy C#** - Click to view and copy the C# class that defines the index as set in the Studio.  
    **Query** - Click to go the the Query View and query this index.  
-   **Terms** - Click to see the index terms, see [below](../../../studio/database/indexes/create-map-index.mdx#index-fields-&-terms).  
+   **Terms** - Click to see the index terms, see [below](../../../studio/database/indexes/create-map-index.mdx#index-fields--terms).  
    **Delete** - Delete this index.  
 
 3. **Index Name** - An index name can be composed of letters, digits, `.`, `/`, `-`, and `_`. The name must be unique in the scope of the database.  
diff --git a/versioned_docs/version-5.3/client-api/data-subscriptions/consumption/api-overview.mdx b/versioned_docs/version-5.3/client-api/data-subscriptions/consumption/api-overview.mdx
index 74a39c729e..86bf8a05c2 100644
--- a/versioned_docs/version-5.3/client-api/data-subscriptions/consumption/api-overview.mdx
+++ b/versioned_docs/version-5.3/client-api/data-subscriptions/consumption/api-overview.mdx
@@ -25,8 +25,8 @@ export const supportedLanguages = ["csharp", "java"];
    * [Subscription worker generation](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscription-worker-generation)  
    * [SubscriptionWorkerOptions](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworkeroptions)  
    * [Running subscription worker](../../../client-api/data-subscriptions/consumption/api-overview.mdx#running-subscription-worker)  
-   * [SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatch&lt;t&gt;)  
-   * [SubscriptionWorker&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworker&lt;t&gt;)  
+   * [SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatcht)  
+   * [SubscriptionWorker&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworkert)  
 
 </Admonition>
 ## Subscription worker generation
@@ -223,8 +223,8 @@ Usage of `RawResult`, `RawMetadata`, and `Metadata` values outside of the docume
    * [Subscription worker generation](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscription-worker-generation)  
    * [SubscriptionWorkerOptions](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworkeroptions)  
    * [Running subscription worker](../../../client-api/data-subscriptions/consumption/api-overview.mdx#running-subscription-worker)  
-   * [SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatch&lt;t&gt;)  
-   * [SubscriptionWorker&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworker&lt;t&gt;)  
+   * [SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatcht)  
+   * [SubscriptionWorker&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworkert)  
 
 </Admonition>
 ## Subscription worker generation
diff --git a/versioned_docs/version-5.3/client-api/data-subscriptions/consumption/examples.mdx b/versioned_docs/version-5.3/client-api/data-subscriptions/consumption/examples.mdx
index 71445a1863..33bc4cefbd 100644
--- a/versioned_docs/version-5.3/client-api/data-subscriptions/consumption/examples.mdx
+++ b/versioned_docs/version-5.3/client-api/data-subscriptions/consumption/examples.mdx
@@ -309,7 +309,7 @@ _ = subscriptionWorker.Run(batch =>
 ## Subscription that uses included documents
 
 Here we create a subscription utilizing the includes feature, by processing `Order` documents and including all `Product`s of each order.  
-When processing the subscription, we create a session using the [SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatch&lt;t&gt;) object, 
+When processing the subscription, we create a session using the [SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatcht) object, 
 and for each order line, we obtain the `Product` document and process it alongside with the `Order`.
 
 <TabItem value="subscription_with_includes_path_usage" label="subscription_with_includes_path_usage">
@@ -660,7 +660,7 @@ subscriptionWorker.run(batch -> \{
 ## Subscription that uses included documents
 
 Here we create a subscription utilizing the includes feature, by processing `Order` documents and including all `Product`s of each order.  
-When processing the subscription, we create a session using the [SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatch&lt;t&gt;) object, 
+When processing the subscription, we create a session using the [SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatcht) object, 
 and for each order line, we obtain the `Product` document and process it alongside with the `Order`.
 
 <TabItem value="subscription_with_includes_path_usage" label="subscription_with_includes_path_usage">
diff --git a/versioned_docs/version-5.3/client-api/data-subscriptions/creation/api-overview.mdx b/versioned_docs/version-5.3/client-api/data-subscriptions/creation/api-overview.mdx
index 06321712fe..b8b6ec7fd6 100644
--- a/versioned_docs/version-5.3/client-api/data-subscriptions/creation/api-overview.mdx
+++ b/versioned_docs/version-5.3/client-api/data-subscriptions/creation/api-overview.mdx
@@ -24,7 +24,7 @@ export const supportedLanguages = ["csharp"];
 * In this page:  
    * [Subscription Creation Overloads Summary](../../../client-api/data-subscriptions/creation/api-overview.mdx#create-and-createasync-overloads-summary)  
    * [SubscriptionCreationOptions](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptions)  
-   * [SubscriptionCreationOptions&lt;T&gt;](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptions&lt;t&gt;)  
+   * [SubscriptionCreationOptions&lt;T&gt;](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptionst)  
    * [Update Subscription](../../../client-api/data-subscriptions/creation/api-overview.mdx#update-subscription)  
    * [SubscriptionUpdateOptions](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptionupdateoptions)  
    * [Subscription query](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscription-query)  
diff --git a/versioned_docs/version-5.3/client-api/faq/transaction-support.mdx b/versioned_docs/version-5.3/client-api/faq/transaction-support.mdx
index cf50fc670d..feb3ea203b 100644
--- a/versioned_docs/version-5.3/client-api/faq/transaction-support.mdx
+++ b/versioned_docs/version-5.3/client-api/faq/transaction-support.mdx
@@ -174,7 +174,7 @@ If you care about avoiding lost updates, you need to ensure you have the conflic
 
 The following is an important aspect to RavenDB's transactional behavior with regards to asynchronous replication.  
 
-When replicating modifications to another server, RavenDB will ensure that the [transaction boundaries](../../server/clustering/replication/replication-overview.mdx#replication-&-transaction-boundary) are maintained.  
+When replicating modifications to another server, RavenDB will ensure that the [transaction boundaries](../../server/clustering/replication/replication-overview.mdx#replication--transaction-boundary) are maintained.  
 If there are several document modifications in the same transaction they will be sent in the same replication batch, keeping the transaction boundary on the destination as well.  
 
 However, a special attention is needed when a document is modified in two separate transactions but the replication of the first transaction has not occurred yet. 
diff --git a/versioned_docs/version-5.3/client-api/session/updating-entities.mdx b/versioned_docs/version-5.3/client-api/session/updating-entities.mdx
index 4b406334dc..5c38fcf25d 100644
--- a/versioned_docs/version-5.3/client-api/session/updating-entities.mdx
+++ b/versioned_docs/version-5.3/client-api/session/updating-entities.mdx
@@ -35,8 +35,8 @@ export const supportedLanguages = ["csharp", "nodejs"];
 
 
 * In this page:
-    * [Load a document & update](../../client-api/session/updating-entities.mdx#load-a-document-&-update)
-    * [Query for documents & update](../../client-api/session/updating-entities.mdx#query-for-documents-&-update)
+    * [Load a document & update](../../client-api/session/updating-entities.mdx#load-a-document--update)
+    * [Query for documents & update](../../client-api/session/updating-entities.mdx#query-for-documents--update)
     
 </Admonition>
 ## Load a document & update
@@ -158,8 +158,8 @@ export const supportedLanguages = ["csharp", "nodejs"];
 
 
 * In this page:
-    * [Load a document & update](../../client-api/session/updating-entities.mdx#load-a-document-&-update)
-    * [Query for documents & update](../../client-api/session/updating-entities.mdx#query-for-documents-&-update)
+    * [Load a document & update](../../client-api/session/updating-entities.mdx#load-a-document--update)
+    * [Query for documents & update](../../client-api/session/updating-entities.mdx#query-for-documents--update)
 
 </Admonition>
 ## Load a document & update
diff --git a/versioned_docs/version-5.3/client-api/session/what-is-a-session-and-how-does-it-work.mdx b/versioned_docs/version-5.3/client-api/session/what-is-a-session-and-how-does-it-work.mdx
index a0e6b75c6f..ea096db22e 100644
--- a/versioned_docs/version-5.3/client-api/session/what-is-a-session-and-how-does-it-work.mdx
+++ b/versioned_docs/version-5.3/client-api/session/what-is-a-session-and-how-does-it-work.mdx
@@ -31,7 +31,7 @@ export const supportedLanguages = ["csharp", "java", "nodejs"];
       * [Create document example](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#create-document-example)
       * [Modify document example](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#modify-document-example)
   * [Identity map pattern](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#identity-map-pattern)
-  * [Batching & Transactions](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#batching-&-transactions)
+  * [Batching & Transactions](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#batching--transactions)
   * [Concurrency control](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#concurrency-control)<br/><br/>
   * [Reducing server calls (best practices) for:](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#reducing-server-calls-(best-practices)-for:)  
       * [The N+1 problem](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#the-select-n1-problem)    
@@ -377,7 +377,7 @@ To address this, the session API offers the concurrency control feature.
         * [Create document example](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#create-document-example)
         * [Modify document example](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#modify-document-example)
     * [Identity map pattern](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#identity-map-pattern)
-    * [Batching & Transactions](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#batching-&-transactions)
+    * [Batching & Transactions](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#batching--transactions)
     * [Concurrency control](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#concurrency-control)<br/><br/>
     * [Reducing server calls (best practices) for:](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#reducing-server-calls-(best-practices)-for:)
         * [The N+1 problem](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#the-select-n1-problem)
@@ -666,7 +666,7 @@ To address this, the session API offers the concurrency control feature.
         * [Create document example](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#create-document-example)
         * [Modify document example](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#modify-document-example)
     * [Identity map pattern](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#identity-map-pattern)
-    * [Batching & Transactions](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#batching-&-transactions)
+    * [Batching & Transactions](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#batching--transactions)
     * [Concurrency control](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#concurrency-control)<br/><br/>
     * [Reducing server calls (best practices) for:](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#reducing-server-calls-(best-practices)-for:)
         * [The N+1 problem](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#the-select-n1-problem)
diff --git a/versioned_docs/version-5.3/indexes/using-dynamic-fields.mdx b/versioned_docs/version-5.3/indexes/using-dynamic-fields.mdx
index 668c5b142d..1fed32ec47 100644
--- a/versioned_docs/version-5.3/indexes/using-dynamic-fields.mdx
+++ b/versioned_docs/version-5.3/indexes/using-dynamic-fields.mdx
@@ -42,7 +42,7 @@ export const supportedLanguages = ["csharp", "java", "nodejs"];
         * [Example - basic](../indexes/using-dynamic-fields.mdx#example---basic)
         * [Example - list](../indexes/using-dynamic-fields.mdx#example---list)
     * [CreateField syntax](../indexes/using-dynamic-fields.mdx#createfield-syntax)
-    * [Indexed fields & terms view](../indexes/using-dynamic-fields.mdx#indexed-fields-&-terms-view)
+    * [Indexed fields & terms view](../indexes/using-dynamic-fields.mdx#indexed-fields--terms-view)
 
 </Admonition>
 
@@ -614,7 +614,7 @@ Below are sample index fields & their terms generated from the last example.
         * [Example - basic](../indexes/using-dynamic-fields.mdx#example---basic)
         * [Example - list](../indexes/using-dynamic-fields.mdx#example---list)
     * [CreateField syntax](../indexes/using-dynamic-fields.mdx#createfield-syntax)
-    * [Indexed fields & terms view](../indexes/using-dynamic-fields.mdx#indexed-fields-&-terms-view)
+    * [Indexed fields & terms view](../indexes/using-dynamic-fields.mdx#indexed-fields--terms-view)
 
 </Admonition>
 
@@ -1112,7 +1112,7 @@ Below are sample index fields & their terms generated from the last example.
         * [Example - basic](../indexes/using-dynamic-fields.mdx#example---basic)
         * [Example - list](../indexes/using-dynamic-fields.mdx#example---list)
     * [CreateField syntax](../indexes/using-dynamic-fields.mdx#createfield-syntax)
-    * [Indexed fields & terms view](../indexes/using-dynamic-fields.mdx#indexed-fields-&-terms-view)
+    * [Indexed fields & terms view](../indexes/using-dynamic-fields.mdx#indexed-fields--terms-view)
 
 </Admonition>
 
diff --git a/versioned_docs/version-5.3/server/clustering/distribution/cluster-observer.mdx b/versioned_docs/version-5.3/server/clustering/distribution/cluster-observer.mdx
index bdae6ae0cd..5b27451f08 100644
--- a/versioned_docs/version-5.3/server/clustering/distribution/cluster-observer.mdx
+++ b/versioned_docs/version-5.3/server/clustering/distribution/cluster-observer.mdx
@@ -42,7 +42,7 @@ The _Cluster Observer_ stores its information **in memory**, so when the `Leader
 
 | URL | Method | Query Params. | Description |
 | - | - | - | - |
-| `/admin/cluster/observer/suspend` | POST | value=[`bool`] | Setting `false` will suspend the _Cluster Observer_ operation for the current [Leader term](../../../studio/cluster/cluster-view.mdx#cluster-nodes-states-&-types-flow). |
+| `/admin/cluster/observer/suspend` | POST | value=[`bool`] | Setting `false` will suspend the _Cluster Observer_ operation for the current [Leader term](../../../studio/cluster/cluster-view.mdx#cluster-nodes-states--types-flow). |
 | `/admin/cluster/observer/decisions` | GET | | Fetch the log of the recent decisions made by the cluster observer. |
 | `/admin/cluster/maintenance-stats` | GET | | Fetch the latest reports of the _Cluster Observer_ |
 
diff --git a/versioned_docs/version-5.3/server/clustering/replication/replication-overview.mdx b/versioned_docs/version-5.3/server/clustering/replication/replication-overview.mdx
index 72ca81e70e..3f08dc1d67 100644
--- a/versioned_docs/version-5.3/server/clustering/replication/replication-overview.mdx
+++ b/versioned_docs/version-5.3/server/clustering/replication/replication-overview.mdx
@@ -32,7 +32,7 @@ import LanguageContent from "@site/src/components/LanguageContent";
       * [Hub/Sink replication](../../../server/clustering/replication/replication-overview.mdx#hubsink-replication)
     * [What is replicated](../../../server/clustering/replication/replication-overview.mdx#what-is-replicated)  
     * [How replication works](../../../server/clustering/replication/replication-overview.mdx#how-replication-works)  
-    * [Replication & transaction boundary](../../../server/clustering/replication/replication-overview.mdx#replication-&-transaction-boundary)  
+    * [Replication & transaction boundary](../../../server/clustering/replication/replication-overview.mdx#replication--transaction-boundary)  
 
 </Admonition>
 ## Replication types
diff --git a/versioned_docs/version-5.3/start/installation/setup-wizard.mdx b/versioned_docs/version-5.3/start/installation/setup-wizard.mdx
index ebb0528394..3b0787ba5c 100644
--- a/versioned_docs/version-5.3/start/installation/setup-wizard.mdx
+++ b/versioned_docs/version-5.3/start/installation/setup-wizard.mdx
@@ -661,7 +661,7 @@ In the **Unsecure Mode**, all you need to do is specify the **IP address** and *
                    This new cluster will only contain this node.  
    * **Unchecked** - The server will Not be created in a cluster.  
                      The server will be created in a 
-                     [Passive State](../../studio/cluster/cluster-view.mdx#cluster-nodes-states-&-types-flow) 
+                     [Passive State](../../studio/cluster/cluster-view.mdx#cluster-nodes-states--types-flow) 
                      and can later be added to an already existing cluster.  
 
 4. **Environment**  
diff --git a/versioned_docs/version-5.3/start/licensing/renew-license.mdx b/versioned_docs/version-5.3/start/licensing/renew-license.mdx
index 31cb51d105..958e35a710 100644
--- a/versioned_docs/version-5.3/start/licensing/renew-license.mdx
+++ b/versioned_docs/version-5.3/start/licensing/renew-license.mdx
@@ -24,7 +24,7 @@ import LanguageContent from "@site/src/components/LanguageContent";
 
 * In this page:
     * [Renew commercial licenses](../../start/licensing/renew-license.mdx#renew-commercial-licenses)
-    * [Renew Developer & Community licenses](../../start/licensing/renew-license.mdx#renew-developer-&-community-licenses)
+    * [Renew Developer & Community licenses](../../start/licensing/renew-license.mdx#renew-developer--community-licenses)
 
 </Admonition>
 ## Renew commercial licenses
diff --git a/versioned_docs/version-5.3/studio/cluster/cluster-view.mdx b/versioned_docs/version-5.3/studio/cluster/cluster-view.mdx
index 51f7e5e122..2d539e56b5 100644
--- a/versioned_docs/version-5.3/studio/cluster/cluster-view.mdx
+++ b/versioned_docs/version-5.3/studio/cluster/cluster-view.mdx
@@ -34,7 +34,7 @@ import LanguageContent from "@site/src/components/LanguageContent";
   * [Cluster View Operations](../../studio/cluster/cluster-view.mdx#cluster-view-operations)  
   * [Reassign Cores](../../studio/cluster/cluster-view.mdx#reassign-cores)  
   * [Cluster Nodes Types](../../studio/cluster/cluster-view.mdx#cluster-nodes-types)  
-  * [Cluster Nodes States & Types Flow](../../studio/cluster/cluster-view.mdx#cluster-nodes-states-&-types-flow)  
+  * [Cluster Nodes States & Types Flow](../../studio/cluster/cluster-view.mdx#cluster-nodes-states--types-flow)  
   * [Cluster-Wide operation -vs- Database Operations](../../studio/cluster/cluster-view.mdx#cluster-wide-operation--vs--database-operations)  
 </Admonition>
 ## Cluster View Stats
diff --git a/versioned_docs/version-5.3/studio/database/indexes/create-map-index.mdx b/versioned_docs/version-5.3/studio/database/indexes/create-map-index.mdx
index 3c49d6b8eb..a7bc4c59b6 100644
--- a/versioned_docs/version-5.3/studio/database/indexes/create-map-index.mdx
+++ b/versioned_docs/version-5.3/studio/database/indexes/create-map-index.mdx
@@ -20,7 +20,7 @@ import LanguageContent from "@site/src/components/LanguageContent";
 
 * In this page:  
   * [Edit Index View](../../../studio/database/indexes/create-map-index.mdx#edit-index-view)  
-  * [Index Fields & Terms](../../../studio/database/indexes/create-map-index.mdx#index-fields-&-terms)  
+  * [Index Fields & Terms](../../../studio/database/indexes/create-map-index.mdx#index-fields--terms)  
   * [Index Field Options](../../../studio/database/indexes/create-map-index.mdx#index-field-options)  
   * [Configuration](../../../studio/database/indexes/create-map-index.mdx#configuration)  
   * [Additional Assemblies](../../../studio/database/indexes/create-map-index.mdx#additional-assemblies)  
@@ -39,7 +39,7 @@ import LanguageContent from "@site/src/components/LanguageContent";
 2. Options available for an already saved index:  
    **Copy C#** - Click to view and copy the C# class that defines the index as set in the Studio.  
    **Query** - Click to go the the Query View and query this index.  
-   **Terms** - Click to see the index terms, see [below](../../../studio/database/indexes/create-map-index.mdx#index-fields-&-terms).  
+   **Terms** - Click to see the index terms, see [below](../../../studio/database/indexes/create-map-index.mdx#index-fields--terms).  
    **Delete** - Delete this index.  
 
 3. **Index Name** - An index name can be composed of letters, digits, `.`, `/`, `-`, and `_`. The name must be unique in the scope of the database.  
diff --git a/versioned_docs/version-5.4/client-api/data-subscriptions/consumption/api-overview.mdx b/versioned_docs/version-5.4/client-api/data-subscriptions/consumption/api-overview.mdx
index 697cbb83d1..963d017485 100644
--- a/versioned_docs/version-5.4/client-api/data-subscriptions/consumption/api-overview.mdx
+++ b/versioned_docs/version-5.4/client-api/data-subscriptions/consumption/api-overview.mdx
@@ -25,9 +25,9 @@ export const supportedLanguages = ["csharp", "java", "python", "nodejs"];
    * [Create the subscription worker](../../../client-api/data-subscriptions/consumption/api-overview.mdx#create-the-subscription-worker)  
    * [SubscriptionWorkerOptions](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworkeroptions)  
    * [Run the subscription worker](../../../client-api/data-subscriptions/consumption/api-overview.mdx#run-the-subscription-worker)  
-   * [SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatch&lt;t&gt;)  
-   * [SubscriptionBatch&lt;T&gt;.Item](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatch&lt;t&gt;item)  
-   * [SubscriptionWorker&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworker&lt;t&gt;)  
+   * [SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatcht)  
+   * [SubscriptionBatch&lt;T&gt;.Item](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatchtitem)  
+   * [SubscriptionWorker&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworkert)  
 
 </Admonition>
 ## Create the subscription worker
@@ -129,7 +129,7 @@ Learn more about `SubscriptionOpeningStrategy` in [worker strategies](../../../c
 ## Run the subscription worker
 
 After [creating](../../../client-api/data-subscriptions/consumption/api-overview.mdx#create-the-subscription-worker) a subscription worker, the subscription worker is still not processing any documents.  
-To start processing, you need to call the `Run` method of the [SubscriptionWorker](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworker&lt;t&gt;).  
+To start processing, you need to call the `Run` method of the [SubscriptionWorker](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworkert).  
 
 The `Run` function takes a delegate, which is your client-side code responsible for processing the received document batches.
 
@@ -160,7 +160,7 @@ Task Run(Func<SubscriptionBatch<T>, Task> processDocuments,
 
 | Member                   | Type                              | Description                                                                                                                                                            |
 |--------------------------|-----------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| **Items**                | `List<SubscriptionBatch<T>.Item>` | List of items in the batch.<br/>See [SubscriptionBatch&lt;T&gt;.Item](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatch&lt;t&gt;item) below. |
+| **Items**                | `List<SubscriptionBatch<T>.Item>` | List of items in the batch.<br/>See [SubscriptionBatch&lt;T&gt;.Item](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatchtitem) below. |
 | **NumberOfItemsInBatch** | `int`                             | Number of items in the batch.                                                                                                                                          |
 
 | Method Signature       | Return value            | Description                                                                                                       |
@@ -285,8 +285,8 @@ Using it outside this scope may cause unexpected behavior.
    * [Create the subscription worker](../../../client-api/data-subscriptions/consumption/api-overview.mdx#create-the-subscription-worker)
    * [SubscriptionWorkerOptions](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworkeroptions)  
    * [Run the subscription worker](../../../client-api/data-subscriptions/consumption/api-overview.mdx#run-the-subscription-worker)  
-   * [SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatch&lt;t&gt;)  
-   * [SubscriptionWorker&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworker&lt;t&gt;)  
+   * [SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatcht)  
+   * [SubscriptionWorker&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworkert)  
 
 </Admonition>
 ## Create the subscription worker
@@ -350,7 +350,7 @@ All other parameters are optional and will default to their respective default v
 ## Run the subscription worker
 
 After [creating](../../../client-api/data-subscriptions/consumption/api-overview.mdx#create-the-subscription-worker) a subscription worker, the subscription worker is still not processing any documents.  
-To start processing, you need to call the `run` method of the [SubscriptionWorker](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworker&lt;t&gt;).
+To start processing, you need to call the `run` method of the [SubscriptionWorker](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworkert).
 
 The `run` function takes a delegate, which is your client-side code responsible for processing the received document batches.
 
diff --git a/versioned_docs/version-5.4/client-api/data-subscriptions/creation/api-overview.mdx b/versioned_docs/version-5.4/client-api/data-subscriptions/creation/api-overview.mdx
index 8eeb7aeec2..ab2e3f2168 100644
--- a/versioned_docs/version-5.4/client-api/data-subscriptions/creation/api-overview.mdx
+++ b/versioned_docs/version-5.4/client-api/data-subscriptions/creation/api-overview.mdx
@@ -23,7 +23,7 @@ export const supportedLanguages = ["csharp", "python", "nodejs"];
 
 * In this page:  
    * [Create subscription](../../../client-api/data-subscriptions/creation/api-overview.mdx#create-subscription)
-   * [SubscriptionCreationOptions&lt;T&gt;](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptions&lt;t&gt;)
+   * [SubscriptionCreationOptions&lt;T&gt;](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptionst)
    * [SubscriptionCreationOptions](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptions)  
    * [Update subscription](../../../client-api/data-subscriptions/creation/api-overview.mdx#update-subscription)  
    * [SubscriptionUpdateOptions](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptionupdateoptions)  
@@ -72,7 +72,7 @@ Task<string> CreateAsync<T>(Expression<Func<T, bool>> predicate = null,
 | Parameter      | Type                             | Description                                                                                                                                                                                  |
 |----------------|----------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | **predicate**  | `Expression<Func<T, bool>>`      | An optional lambda expression that returns a boolean.<br/>This predicate defines the filter criteria for the subscription documents.                                                          |
-| **options**    | `SubscriptionCreationOptions<T>` | Contains subscription creation options.<br/>See [SubscriptionCreationOptions&lt;T&gt;](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptions&lt;t&gt;)           |
+| **options**    | `SubscriptionCreationOptions<T>` | Contains subscription creation options.<br/>See [SubscriptionCreationOptions&lt;T&gt;](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptionst)           |
 | **options**    | `SubscriptionCreationOptions`    | Contains subscription creation options - non-generic version.<br/>See [SubscriptionCreationOptions](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptions) |
 | **database**   | `string`                         | The name of the database where the subscription task will be created. If `null`, the default database configured in the DocumentStore will be used.                                          |
 | **token**      | `CancellationToken`              | Cancellation token used in to halt the subscription creation process.                                                                                                                  |
diff --git a/versioned_docs/version-5.4/client-api/data-subscriptions/creation/examples.mdx b/versioned_docs/version-5.4/client-api/data-subscriptions/creation/examples.mdx
index 1914e600aa..d30f03a020 100644
--- a/versioned_docs/version-5.4/client-api/data-subscriptions/creation/examples.mdx
+++ b/versioned_docs/version-5.4/client-api/data-subscriptions/creation/examples.mdx
@@ -278,7 +278,7 @@ See how to consume this type of subscription [here](../../../client-api/data-sub
 **Include using builder**:
 
 Include statements can be added to the subscription with `ISubscriptionIncludeBuilder`.  
-This builder is assigned to the  `Includes` property in [SubscriptionCreationOptions&lt;T&gt;](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptions&lt;t&gt;).  
+This builder is assigned to the  `Includes` property in [SubscriptionCreationOptions&lt;T&gt;](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptionst).  
 It supports methods for including documents as well as [counters](../../../client-api/data-subscriptions/creation/examples.mdx#create-subscription---include-counters). 
 These methods can be chained.
 
@@ -700,7 +700,7 @@ See how to consume this type of subscription [here](../../../client-api/data-sub
 **Include using builder**:
 
 Include statements can be added to the subscription with `SubscriptionIncludeBuilder`.  
-This builder is assigned to the  `includes` property in [SubscriptionCreationOptions](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptions&lt;t&gt;).  
+This builder is assigned to the  `includes` property in [SubscriptionCreationOptions](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptionst).  
 It supports methods for including documents as well as [counters](../../../client-api/data-subscriptions/creation/examples.mdx#create-subscription---include-counters).
 These methods can be chained.  
 
diff --git a/versioned_docs/version-5.4/client-api/faq/transaction-support.mdx b/versioned_docs/version-5.4/client-api/faq/transaction-support.mdx
index cf50fc670d..feb3ea203b 100644
--- a/versioned_docs/version-5.4/client-api/faq/transaction-support.mdx
+++ b/versioned_docs/version-5.4/client-api/faq/transaction-support.mdx
@@ -174,7 +174,7 @@ If you care about avoiding lost updates, you need to ensure you have the conflic
 
 The following is an important aspect to RavenDB's transactional behavior with regards to asynchronous replication.  
 
-When replicating modifications to another server, RavenDB will ensure that the [transaction boundaries](../../server/clustering/replication/replication-overview.mdx#replication-&-transaction-boundary) are maintained.  
+When replicating modifications to another server, RavenDB will ensure that the [transaction boundaries](../../server/clustering/replication/replication-overview.mdx#replication--transaction-boundary) are maintained.  
 If there are several document modifications in the same transaction they will be sent in the same replication batch, keeping the transaction boundary on the destination as well.  
 
 However, a special attention is needed when a document is modified in two separate transactions but the replication of the first transaction has not occurred yet. 
diff --git a/versioned_docs/version-5.4/client-api/session/updating-entities.mdx b/versioned_docs/version-5.4/client-api/session/updating-entities.mdx
index f4a0148763..8e5d3dc888 100644
--- a/versioned_docs/version-5.4/client-api/session/updating-entities.mdx
+++ b/versioned_docs/version-5.4/client-api/session/updating-entities.mdx
@@ -35,8 +35,8 @@ export const supportedLanguages = ["csharp", "python", "php", "nodejs"];
 
 
 * In this page:
-    * [Load a document & update](../../client-api/session/updating-entities.mdx#load-a-document-&-update)
-    * [Query for documents & update](../../client-api/session/updating-entities.mdx#query-for-documents-&-update)
+    * [Load a document & update](../../client-api/session/updating-entities.mdx#load-a-document--update)
+    * [Query for documents & update](../../client-api/session/updating-entities.mdx#query-for-documents--update)
     
 </Admonition>
 ## Load a document & update
@@ -158,8 +158,8 @@ export const supportedLanguages = ["csharp", "python", "php", "nodejs"];
 
 
 * In this page:
-    * [Load a document & update](../../client-api/session/updating-entities.mdx#load-a-document-&-update)
-    * [Query for documents & update](../../client-api/session/updating-entities.mdx#query-for-documents-&-update)
+    * [Load a document & update](../../client-api/session/updating-entities.mdx#load-a-document--update)
+    * [Query for documents & update](../../client-api/session/updating-entities.mdx#query-for-documents--update)
     
 </Admonition>
 ## Load a document & update
@@ -236,8 +236,8 @@ export const supportedLanguages = ["csharp", "python", "php", "nodejs"];
 
 
 * In this page:
-    * [Load a document & update](../../client-api/session/updating-entities.mdx#load-a-document-&-update)
-    * [Query for documents & update](../../client-api/session/updating-entities.mdx#query-for-documents-&-update)
+    * [Load a document & update](../../client-api/session/updating-entities.mdx#load-a-document--update)
+    * [Query for documents & update](../../client-api/session/updating-entities.mdx#query-for-documents--update)
     
 </Admonition>
 ## Load a document & update
@@ -323,8 +323,8 @@ try \{
 
 
 * In this page:
-    * [Load a document & update](../../client-api/session/updating-entities.mdx#load-a-document-&-update)
-    * [Query for documents & update](../../client-api/session/updating-entities.mdx#query-for-documents-&-update)
+    * [Load a document & update](../../client-api/session/updating-entities.mdx#load-a-document--update)
+    * [Query for documents & update](../../client-api/session/updating-entities.mdx#query-for-documents--update)
 
 </Admonition>
 ## Load a document & update
diff --git a/versioned_docs/version-5.4/client-api/session/what-is-a-session-and-how-does-it-work.mdx b/versioned_docs/version-5.4/client-api/session/what-is-a-session-and-how-does-it-work.mdx
index 857a8135bf..1dba0285f5 100644
--- a/versioned_docs/version-5.4/client-api/session/what-is-a-session-and-how-does-it-work.mdx
+++ b/versioned_docs/version-5.4/client-api/session/what-is-a-session-and-how-does-it-work.mdx
@@ -31,7 +31,7 @@ export const supportedLanguages = ["csharp", "java", "python", "php", "nodejs"];
       * [Create document example](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#create-document-example)
       * [Modify document example](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#modify-document-example)
   * [Identity map pattern](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#identity-map-pattern)
-  * [Batching & Transactions](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#batching-&-transactions)
+  * [Batching & Transactions](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#batching--transactions)
   * [Concurrency control](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#concurrency-control)
   * [Reducing server calls (best practices) for:](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#reducing-server-calls-(best-practices)-for:)  
       * [The N+1 problem](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#the-select-n1-problem)    
@@ -380,7 +380,7 @@ To address this, the session API offers the concurrency control feature.
         * [Create document example](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#create-document-example)
         * [Modify document example](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#modify-document-example)
     * [Identity map pattern](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#identity-map-pattern)
-    * [Batching & Transactions](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#batching-&-transactions)
+    * [Batching & Transactions](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#batching--transactions)
     * [Concurrency control](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#concurrency-control)
     * [Reducing server calls (best practices) for:](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#reducing-server-calls-(best-practices)-for:)
         * [The N+1 problem](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#the-select-n1-problem)
@@ -669,7 +669,7 @@ To address this, the session API offers the concurrency control feature.
       * [Create document example](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#create-document-example)
       * [Modify document example](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#modify-document-example)
   * [Identity map pattern](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#identity-map-pattern)
-  * [Batching & Transactions](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#batching-&-transactions)
+  * [Batching & Transactions](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#batching--transactions)
   * [Concurrency control](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#concurrency-control)
   * [Reducing server calls (best practices) for:](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#reducing-server-calls-(best-practices)-for:)  
       * [The N+1 problem](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#the-select-n1-problem)    
@@ -953,7 +953,7 @@ To address this, the session API offers the concurrency control feature.
       * [Create document example](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#create-document-example)
       * [Modify document example](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#modify-document-example)
   * [Identity map pattern](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#identity-map-pattern)
-  * [Batching & Transactions](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#batching-&-transactions)
+  * [Batching & Transactions](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#batching--transactions)
   * [Concurrency control](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#concurrency-control)
   * [Reducing server calls (best practices) for:](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#reducing-server-calls-(best-practices)-for:)  
       * [The N+1 problem](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#the-select-n1-problem)    
@@ -1247,7 +1247,7 @@ To address this, the session API offers the concurrency control feature.
         * [Create document example](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#create-document-example)
         * [Modify document example](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#modify-document-example)
     * [Identity map pattern](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#identity-map-pattern)
-    * [Batching & Transactions](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#batching-&-transactions)
+    * [Batching & Transactions](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#batching--transactions)
     * [Concurrency control](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#concurrency-control)
     * [Reducing server calls (best practices) for:](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#reducing-server-calls-(best-practices)-for:)
         * [The N+1 problem](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#the-select-n1-problem)
diff --git a/versioned_docs/version-5.4/document-extensions/attachments/indexing.mdx b/versioned_docs/version-5.4/document-extensions/attachments/indexing.mdx
index 5c2aae2243..487b656c9c 100644
--- a/versioned_docs/version-5.4/document-extensions/attachments/indexing.mdx
+++ b/versioned_docs/version-5.4/document-extensions/attachments/indexing.mdx
@@ -31,8 +31,8 @@ export const supportedLanguages = ["csharp", "java", "python", "php", "nodejs"];
 
 * In this page:
     * [Index attachments details](../../document-extensions/attachments/indexing.mdx#index-attachments-details)
-    * [Index details & content - by attachment name](../../document-extensions/attachments/indexing.mdx#index-details-&-content---by-attachment-name)
-    * [Index details & content - all attachments](../../document-extensions/attachments/indexing.mdx#index-details-&-content---all-attachments)
+    * [Index details & content - by attachment name](../../document-extensions/attachments/indexing.mdx#index-details--content---by-attachment-name)
+    * [Index details & content - all attachments](../../document-extensions/attachments/indexing.mdx#index-details--content---all-attachments)
     * [Leveraging indexed attachments](../../document-extensions/attachments/indexing.mdx#leveraging-indexed-attachments)
     * [Syntax](../../document-extensions/attachments/indexing.mdx#syntax)
 
@@ -47,7 +47,7 @@ export const supportedLanguages = ["csharp", "java", "python", "php", "nodejs"];
   These details can then be used when defining the index-fields.
   Once the index is deployed, you can query the index to find Employee documents based on these attachment properties.
 
-* To index **attachments' content**, see the examples [below](../../document-extensions/attachments/indexing.mdx#index-details-&-content---by-attachment-name).
+* To index **attachments' content**, see the examples [below](../../document-extensions/attachments/indexing.mdx#index-details--content---by-attachment-name).
 
 <Tabs groupId='languageSyntax'>
 <TabItem value="LINQ_index" label="LINQ_index">
@@ -1339,8 +1339,8 @@ $employees = $session
 
 * In this page:  
   * [Index attachments details](../../document-extensions/attachments/indexing.mdx#index-attachments-details)
-  * [Index details & content - by attachment name](../../document-extensions/attachments/indexing.mdx#index-details-&-content---by-attachment-name)
-  * [Index details & content - all attachments](../../document-extensions/attachments/indexing.mdx#index-details-&-content---all-attachments)
+  * [Index details & content - by attachment name](../../document-extensions/attachments/indexing.mdx#index-details--content---by-attachment-name)
+  * [Index details & content - all attachments](../../document-extensions/attachments/indexing.mdx#index-details--content---all-attachments)
   * [Leveraging indexed attachments](../../document-extensions/attachments/indexing.mdx#leveraging-indexed-attachments)
   * [Syntax](../../document-extensions/attachments/indexing.mdx#syntax)
 
@@ -1356,7 +1356,7 @@ $employees = $session
   These details can then be used when defining the index-fields.
   Once the index is deployed, you can query the index to find Employee documents based on these attachment properties.
 
-* To index **attachments' content**, see the examples [below](../../document-extensions/attachments/indexing.mdx#index-details-&-content---by-attachment-name).
+* To index **attachments' content**, see the examples [below](../../document-extensions/attachments/indexing.mdx#index-details--content---by-attachment-name).
 
 <TabItem value="index_1" label="index_1">
 <CodeBlock language="js">
diff --git a/versioned_docs/version-5.4/indexes/multi-map-indexes.mdx b/versioned_docs/version-5.4/indexes/multi-map-indexes.mdx
index 32e13c5096..c8aff3d301 100644
--- a/versioned_docs/version-5.4/indexes/multi-map-indexes.mdx
+++ b/versioned_docs/version-5.4/indexes/multi-map-indexes.mdx
@@ -28,7 +28,7 @@ export const supportedLanguages = ["csharp", "java", "python", "php", "nodejs"];
   Learn how to [create Multi-Map-Reduce indexes](../indexes/map-reduce-indexes.mdx#creating-multi-map-reduce-indexes)  
 
 * In this page:
-  * [AddMap & AddMapForAll](../indexes/multi-map-indexes.mdx#addmap-&-addmapforall)
+  * [AddMap & AddMapForAll](../indexes/multi-map-indexes.mdx#addmap--addmapforall)
   * [Searching across multiple collections](../indexes/multi-map-indexes.mdx#searching-across-multiple-collections)
   * [Remarks](../indexes/multi-map-indexes.mdx#remarks)
 
diff --git a/versioned_docs/version-5.4/indexes/using-dynamic-fields.mdx b/versioned_docs/version-5.4/indexes/using-dynamic-fields.mdx
index 6c5cca18ba..8f8e49760c 100644
--- a/versioned_docs/version-5.4/indexes/using-dynamic-fields.mdx
+++ b/versioned_docs/version-5.4/indexes/using-dynamic-fields.mdx
@@ -42,7 +42,7 @@ export const supportedLanguages = ["csharp", "java", "python", "php", "nodejs"];
         * [Example - basic](../indexes/using-dynamic-fields.mdx#example---basic)
         * [Example - list](../indexes/using-dynamic-fields.mdx#example---list)
     * [CreateField syntax](../indexes/using-dynamic-fields.mdx#createfield-syntax)
-    * [Indexed fields & terms view](../indexes/using-dynamic-fields.mdx#indexed-fields-&-terms-view)
+    * [Indexed fields & terms view](../indexes/using-dynamic-fields.mdx#indexed-fields--terms-view)
 
 </Admonition>
 
@@ -604,7 +604,7 @@ Below are sample index fields & their terms generated from the last example.
         * [Example - basic](../indexes/using-dynamic-fields.mdx#example---basic)
         * [Example - list](../indexes/using-dynamic-fields.mdx#example---list)
     * [CreateField syntax](../indexes/using-dynamic-fields.mdx#createfield-syntax)
-    * [Indexed fields & terms view](../indexes/using-dynamic-fields.mdx#indexed-fields-&-terms-view)
+    * [Indexed fields & terms view](../indexes/using-dynamic-fields.mdx#indexed-fields--terms-view)
 
 </Admonition>
 
@@ -1090,7 +1090,7 @@ Below are sample index fields & their terms generated from the last example.
         * [Example - basic](../indexes/using-dynamic-fields.mdx#example---basic)
         * [Example - list](../indexes/using-dynamic-fields.mdx#example---list)
     * [CreateField syntax](../indexes/using-dynamic-fields.mdx#createfield-syntax)
-    * [Indexed fields & terms view](../indexes/using-dynamic-fields.mdx#indexed-fields-&-terms-view)
+    * [Indexed fields & terms view](../indexes/using-dynamic-fields.mdx#indexed-fields--terms-view)
 
 </Admonition>
 
@@ -1608,7 +1608,7 @@ Below are sample index fields & their terms generated from the last example.
         * [Example - basic](../indexes/using-dynamic-fields.mdx#example---basic)
         * [Example - list](../indexes/using-dynamic-fields.mdx#example---list)
     * [CreateField syntax](../indexes/using-dynamic-fields.mdx#createfield-syntax)
-    * [Indexed fields & terms view](../indexes/using-dynamic-fields.mdx#indexed-fields-&-terms-view)
+    * [Indexed fields & terms view](../indexes/using-dynamic-fields.mdx#indexed-fields--terms-view)
 
 </Admonition>
 
@@ -2174,7 +2174,7 @@ Below are sample index fields & their terms generated from the last example.
         * [Example - basic](../indexes/using-dynamic-fields.mdx#example---basic)
         * [Example - list](../indexes/using-dynamic-fields.mdx#example---list)
     * [CreateField syntax](../indexes/using-dynamic-fields.mdx#createfield-syntax)
-    * [Indexed fields & terms view](../indexes/using-dynamic-fields.mdx#indexed-fields-&-terms-view)
+    * [Indexed fields & terms view](../indexes/using-dynamic-fields.mdx#indexed-fields--terms-view)
 
 </Admonition>
 
diff --git a/versioned_docs/version-5.4/server/clustering/distribution/cluster-observer.mdx b/versioned_docs/version-5.4/server/clustering/distribution/cluster-observer.mdx
index bdae6ae0cd..5b27451f08 100644
--- a/versioned_docs/version-5.4/server/clustering/distribution/cluster-observer.mdx
+++ b/versioned_docs/version-5.4/server/clustering/distribution/cluster-observer.mdx
@@ -42,7 +42,7 @@ The _Cluster Observer_ stores its information **in memory**, so when the `Leader
 
 | URL | Method | Query Params. | Description |
 | - | - | - | - |
-| `/admin/cluster/observer/suspend` | POST | value=[`bool`] | Setting `false` will suspend the _Cluster Observer_ operation for the current [Leader term](../../../studio/cluster/cluster-view.mdx#cluster-nodes-states-&-types-flow). |
+| `/admin/cluster/observer/suspend` | POST | value=[`bool`] | Setting `false` will suspend the _Cluster Observer_ operation for the current [Leader term](../../../studio/cluster/cluster-view.mdx#cluster-nodes-states--types-flow). |
 | `/admin/cluster/observer/decisions` | GET | | Fetch the log of the recent decisions made by the cluster observer. |
 | `/admin/cluster/maintenance-stats` | GET | | Fetch the latest reports of the _Cluster Observer_ |
 
diff --git a/versioned_docs/version-5.4/server/clustering/replication/replication-overview.mdx b/versioned_docs/version-5.4/server/clustering/replication/replication-overview.mdx
index 72ca81e70e..3f08dc1d67 100644
--- a/versioned_docs/version-5.4/server/clustering/replication/replication-overview.mdx
+++ b/versioned_docs/version-5.4/server/clustering/replication/replication-overview.mdx
@@ -32,7 +32,7 @@ import LanguageContent from "@site/src/components/LanguageContent";
       * [Hub/Sink replication](../../../server/clustering/replication/replication-overview.mdx#hubsink-replication)
     * [What is replicated](../../../server/clustering/replication/replication-overview.mdx#what-is-replicated)  
     * [How replication works](../../../server/clustering/replication/replication-overview.mdx#how-replication-works)  
-    * [Replication & transaction boundary](../../../server/clustering/replication/replication-overview.mdx#replication-&-transaction-boundary)  
+    * [Replication & transaction boundary](../../../server/clustering/replication/replication-overview.mdx#replication--transaction-boundary)  
 
 </Admonition>
 ## Replication types
diff --git a/versioned_docs/version-5.4/start/installation/setup-wizard.mdx b/versioned_docs/version-5.4/start/installation/setup-wizard.mdx
index ebb0528394..3b0787ba5c 100644
--- a/versioned_docs/version-5.4/start/installation/setup-wizard.mdx
+++ b/versioned_docs/version-5.4/start/installation/setup-wizard.mdx
@@ -661,7 +661,7 @@ In the **Unsecure Mode**, all you need to do is specify the **IP address** and *
                    This new cluster will only contain this node.  
    * **Unchecked** - The server will Not be created in a cluster.  
                      The server will be created in a 
-                     [Passive State](../../studio/cluster/cluster-view.mdx#cluster-nodes-states-&-types-flow) 
+                     [Passive State](../../studio/cluster/cluster-view.mdx#cluster-nodes-states--types-flow) 
                      and can later be added to an already existing cluster.  
 
 4. **Environment**  
diff --git a/versioned_docs/version-5.4/start/licensing/renew-license.mdx b/versioned_docs/version-5.4/start/licensing/renew-license.mdx
index 971ada6629..f45895e18b 100644
--- a/versioned_docs/version-5.4/start/licensing/renew-license.mdx
+++ b/versioned_docs/version-5.4/start/licensing/renew-license.mdx
@@ -24,7 +24,7 @@ import LanguageContent from "@site/src/components/LanguageContent";
 
 * In this page:
     * [Renew commercial licenses](../../start/licensing/renew-license.mdx#renew-commercial-licenses)
-    * [Renew Developer & Community licenses](../../start/licensing/renew-license.mdx#renew-developer-&-community-licenses)
+    * [Renew Developer & Community licenses](../../start/licensing/renew-license.mdx#renew-developer--community-licenses)
 
 </Admonition>
 ## Renew commercial licenses
diff --git a/versioned_docs/version-5.4/studio/cluster/cluster-view.mdx b/versioned_docs/version-5.4/studio/cluster/cluster-view.mdx
index 51f7e5e122..2d539e56b5 100644
--- a/versioned_docs/version-5.4/studio/cluster/cluster-view.mdx
+++ b/versioned_docs/version-5.4/studio/cluster/cluster-view.mdx
@@ -34,7 +34,7 @@ import LanguageContent from "@site/src/components/LanguageContent";
   * [Cluster View Operations](../../studio/cluster/cluster-view.mdx#cluster-view-operations)  
   * [Reassign Cores](../../studio/cluster/cluster-view.mdx#reassign-cores)  
   * [Cluster Nodes Types](../../studio/cluster/cluster-view.mdx#cluster-nodes-types)  
-  * [Cluster Nodes States & Types Flow](../../studio/cluster/cluster-view.mdx#cluster-nodes-states-&-types-flow)  
+  * [Cluster Nodes States & Types Flow](../../studio/cluster/cluster-view.mdx#cluster-nodes-states--types-flow)  
   * [Cluster-Wide operation -vs- Database Operations](../../studio/cluster/cluster-view.mdx#cluster-wide-operation--vs--database-operations)  
 </Admonition>
 ## Cluster View Stats
diff --git a/versioned_docs/version-5.4/studio/database/indexes/create-map-index.mdx b/versioned_docs/version-5.4/studio/database/indexes/create-map-index.mdx
index 7175457343..95e874d62c 100644
--- a/versioned_docs/version-5.4/studio/database/indexes/create-map-index.mdx
+++ b/versioned_docs/version-5.4/studio/database/indexes/create-map-index.mdx
@@ -20,7 +20,7 @@ import LanguageContent from "@site/src/components/LanguageContent";
 
 * In this page:  
   * [Edit Index View](../../../studio/database/indexes/create-map-index.mdx#edit-index-view)  
-  * [Index Fields & Terms](../../../studio/database/indexes/create-map-index.mdx#index-fields-&-terms)  
+  * [Index Fields & Terms](../../../studio/database/indexes/create-map-index.mdx#index-fields--terms)  
   * [Index Field Options](../../../studio/database/indexes/create-map-index.mdx#index-field-options)  
   * [Configuration](../../../studio/database/indexes/create-map-index.mdx#configuration)  
   * [Additional Assemblies](../../../studio/database/indexes/create-map-index.mdx#additional-assemblies)  
@@ -39,7 +39,7 @@ import LanguageContent from "@site/src/components/LanguageContent";
 2. Options available for an already saved index:  
    **Copy C#** - Click to view and copy the C# class that defines the index as set in the Studio.  
    **Query** - Click to go the the Query View and query this index.  
-   **Terms** - Click to see the index terms, see [below](../../../studio/database/indexes/create-map-index.mdx#index-fields-&-terms).  
+   **Terms** - Click to see the index terms, see [below](../../../studio/database/indexes/create-map-index.mdx#index-fields--terms).  
    **Delete** - Delete this index.  
 
 3. **Index Name** - An index name can be composed of letters, digits, `.`, `/`, `-`, and `_`. The name must be unique in the scope of the database.  
diff --git a/versioned_docs/version-6.0/client-api/commands/documents/delete.mdx b/versioned_docs/version-6.0/client-api/commands/documents/delete.mdx
index 60b97e52ea..430737f570 100644
--- a/versioned_docs/version-6.0/client-api/commands/documents/delete.mdx
+++ b/versioned_docs/version-6.0/client-api/commands/documents/delete.mdx
@@ -159,7 +159,7 @@ catch (Exception e)
 | Parameter        | Type     | Description                                                                                                                                                                                                                                             |
 |------------------|----------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | **id**           | `string` | The ID of the document to delete.                                                                                                                                                                                                                       |
-| **changeVector** | `string` | The change-vector of the document you wish to delete,<br/>used for [optimistic concurrency control](../../../server/clustering/replication/change-vector.mdx#concurrency-control-&-change-vectors).<br/>Pass `null` to skip the check and force the deletion. |
+| **changeVector** | `string` | The change-vector of the document you wish to delete,<br/>used for [optimistic concurrency control](../../../server/clustering/replication/change-vector.mdx#concurrency-control--change-vectors).<br/>Pass `null` to skip the check and force the deletion. |
 
 
 
@@ -376,7 +376,7 @@ catch (err) \{
 | Parameter        | Type     | Description                                                                                                                                                                                                                                             |
 |------------------|----------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | **id**           | `string` | The ID of the document to delete.                                                                                                                                                                                                                       |
-| **changeVector** | `string` | The change-vector of the document you wish to delete,<br/>used for [optimistic concurrency control](../../../server/clustering/replication/change-vector.mdx#concurrency-control-&-change-vectors).<br/>Pass `null` to skip the check and force the deletion. |
+| **changeVector** | `string` | The change-vector of the document you wish to delete,<br/>used for [optimistic concurrency control](../../../server/clustering/replication/change-vector.mdx#concurrency-control--change-vectors).<br/>Pass `null` to skip the check and force the deletion. |
 
 
 
diff --git a/versioned_docs/version-6.0/client-api/commands/documents/put.mdx b/versioned_docs/version-6.0/client-api/commands/documents/put.mdx
index bbb24eb9f5..0ed48b248c 100644
--- a/versioned_docs/version-6.0/client-api/commands/documents/put.mdx
+++ b/versioned_docs/version-6.0/client-api/commands/documents/put.mdx
@@ -193,7 +193,7 @@ var theDocumentCV = putResult.ChangeVector;
 | Parameter        | Type                        | Description                                                                                                                                                                                                                                          |
 |------------------|-----------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | **id**           | `string`                    | Unique ID under which document will be stored.                                                                                                                                                                                                       |
-| **changeVector** | `string`                    | The change-vector of the document you wish to update,<br/>used for [optimistic concurrency control](../../../server/clustering/replication/change-vector.mdx#concurrency-control-&-change-vectors).<br/>Pass `null` to skip the check and force the 'put'. |
+| **changeVector** | `string`                    | The change-vector of the document you wish to update,<br/>used for [optimistic concurrency control](../../../server/clustering/replication/change-vector.mdx#concurrency-control--change-vectors).<br/>Pass `null` to skip the check and force the 'put'. |
 | **document**     | `BlittableJsonReaderObject` | The document to store. Use:<br/>`session.Advanced.JsonConverter.ToBlittable(doc, docInfo);` to convert your entity to a `BlittableJsonReaderObject`.                                                                                                  |
 
 <TabItem value="syntax_2" label="syntax_2">
@@ -478,7 +478,7 @@ assert.strictEqual(theDocumentID, "categories/999");
 | Parameter        | Type     | Description                                                                                                                                                                                                                                          |
 |------------------|----------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | **id**           | `string` | Unique ID under which document will be stored.                                                                                                                                                                                                       |
-| **changeVector** | `string` | The change-vector of the document you wish to update,<br/>used for [optimistic concurrency control](../../../server/clustering/replication/change-vector.mdx#concurrency-control-&-change-vectors).<br/>Pass `null` to skip the check and force the 'put'. |
+| **changeVector** | `string` | The change-vector of the document you wish to update,<br/>used for [optimistic concurrency control](../../../server/clustering/replication/change-vector.mdx#concurrency-control--change-vectors).<br/>Pass `null` to skip the check and force the 'put'. |
 | **document**     | `object` | The document to store.                                                                                                                                                                                                                               |
 
 <TabItem value="syntax_2" label="syntax_2">
diff --git a/versioned_docs/version-6.0/client-api/data-subscriptions/consumption/api-overview.mdx b/versioned_docs/version-6.0/client-api/data-subscriptions/consumption/api-overview.mdx
index 697cbb83d1..963d017485 100644
--- a/versioned_docs/version-6.0/client-api/data-subscriptions/consumption/api-overview.mdx
+++ b/versioned_docs/version-6.0/client-api/data-subscriptions/consumption/api-overview.mdx
@@ -25,9 +25,9 @@ export const supportedLanguages = ["csharp", "java", "python", "nodejs"];
    * [Create the subscription worker](../../../client-api/data-subscriptions/consumption/api-overview.mdx#create-the-subscription-worker)  
    * [SubscriptionWorkerOptions](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworkeroptions)  
    * [Run the subscription worker](../../../client-api/data-subscriptions/consumption/api-overview.mdx#run-the-subscription-worker)  
-   * [SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatch&lt;t&gt;)  
-   * [SubscriptionBatch&lt;T&gt;.Item](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatch&lt;t&gt;item)  
-   * [SubscriptionWorker&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworker&lt;t&gt;)  
+   * [SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatcht)  
+   * [SubscriptionBatch&lt;T&gt;.Item](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatchtitem)  
+   * [SubscriptionWorker&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworkert)  
 
 </Admonition>
 ## Create the subscription worker
@@ -129,7 +129,7 @@ Learn more about `SubscriptionOpeningStrategy` in [worker strategies](../../../c
 ## Run the subscription worker
 
 After [creating](../../../client-api/data-subscriptions/consumption/api-overview.mdx#create-the-subscription-worker) a subscription worker, the subscription worker is still not processing any documents.  
-To start processing, you need to call the `Run` method of the [SubscriptionWorker](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworker&lt;t&gt;).  
+To start processing, you need to call the `Run` method of the [SubscriptionWorker](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworkert).  
 
 The `Run` function takes a delegate, which is your client-side code responsible for processing the received document batches.
 
@@ -160,7 +160,7 @@ Task Run(Func<SubscriptionBatch<T>, Task> processDocuments,
 
 | Member                   | Type                              | Description                                                                                                                                                            |
 |--------------------------|-----------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| **Items**                | `List<SubscriptionBatch<T>.Item>` | List of items in the batch.<br/>See [SubscriptionBatch&lt;T&gt;.Item](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatch&lt;t&gt;item) below. |
+| **Items**                | `List<SubscriptionBatch<T>.Item>` | List of items in the batch.<br/>See [SubscriptionBatch&lt;T&gt;.Item](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatchtitem) below. |
 | **NumberOfItemsInBatch** | `int`                             | Number of items in the batch.                                                                                                                                          |
 
 | Method Signature       | Return value            | Description                                                                                                       |
@@ -285,8 +285,8 @@ Using it outside this scope may cause unexpected behavior.
    * [Create the subscription worker](../../../client-api/data-subscriptions/consumption/api-overview.mdx#create-the-subscription-worker)
    * [SubscriptionWorkerOptions](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworkeroptions)  
    * [Run the subscription worker](../../../client-api/data-subscriptions/consumption/api-overview.mdx#run-the-subscription-worker)  
-   * [SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatch&lt;t&gt;)  
-   * [SubscriptionWorker&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworker&lt;t&gt;)  
+   * [SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatcht)  
+   * [SubscriptionWorker&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworkert)  
 
 </Admonition>
 ## Create the subscription worker
@@ -350,7 +350,7 @@ All other parameters are optional and will default to their respective default v
 ## Run the subscription worker
 
 After [creating](../../../client-api/data-subscriptions/consumption/api-overview.mdx#create-the-subscription-worker) a subscription worker, the subscription worker is still not processing any documents.  
-To start processing, you need to call the `run` method of the [SubscriptionWorker](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworker&lt;t&gt;).
+To start processing, you need to call the `run` method of the [SubscriptionWorker](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworkert).
 
 The `run` function takes a delegate, which is your client-side code responsible for processing the received document batches.
 
diff --git a/versioned_docs/version-6.0/client-api/data-subscriptions/creation/api-overview.mdx b/versioned_docs/version-6.0/client-api/data-subscriptions/creation/api-overview.mdx
index 8eeb7aeec2..ab2e3f2168 100644
--- a/versioned_docs/version-6.0/client-api/data-subscriptions/creation/api-overview.mdx
+++ b/versioned_docs/version-6.0/client-api/data-subscriptions/creation/api-overview.mdx
@@ -23,7 +23,7 @@ export const supportedLanguages = ["csharp", "python", "nodejs"];
 
 * In this page:  
    * [Create subscription](../../../client-api/data-subscriptions/creation/api-overview.mdx#create-subscription)
-   * [SubscriptionCreationOptions&lt;T&gt;](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptions&lt;t&gt;)
+   * [SubscriptionCreationOptions&lt;T&gt;](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptionst)
    * [SubscriptionCreationOptions](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptions)  
    * [Update subscription](../../../client-api/data-subscriptions/creation/api-overview.mdx#update-subscription)  
    * [SubscriptionUpdateOptions](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptionupdateoptions)  
@@ -72,7 +72,7 @@ Task<string> CreateAsync<T>(Expression<Func<T, bool>> predicate = null,
 | Parameter      | Type                             | Description                                                                                                                                                                                  |
 |----------------|----------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | **predicate**  | `Expression<Func<T, bool>>`      | An optional lambda expression that returns a boolean.<br/>This predicate defines the filter criteria for the subscription documents.                                                          |
-| **options**    | `SubscriptionCreationOptions<T>` | Contains subscription creation options.<br/>See [SubscriptionCreationOptions&lt;T&gt;](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptions&lt;t&gt;)           |
+| **options**    | `SubscriptionCreationOptions<T>` | Contains subscription creation options.<br/>See [SubscriptionCreationOptions&lt;T&gt;](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptionst)           |
 | **options**    | `SubscriptionCreationOptions`    | Contains subscription creation options - non-generic version.<br/>See [SubscriptionCreationOptions](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptions) |
 | **database**   | `string`                         | The name of the database where the subscription task will be created. If `null`, the default database configured in the DocumentStore will be used.                                          |
 | **token**      | `CancellationToken`              | Cancellation token used in to halt the subscription creation process.                                                                                                                  |
diff --git a/versioned_docs/version-6.0/client-api/data-subscriptions/creation/examples.mdx b/versioned_docs/version-6.0/client-api/data-subscriptions/creation/examples.mdx
index 1914e600aa..d30f03a020 100644
--- a/versioned_docs/version-6.0/client-api/data-subscriptions/creation/examples.mdx
+++ b/versioned_docs/version-6.0/client-api/data-subscriptions/creation/examples.mdx
@@ -278,7 +278,7 @@ See how to consume this type of subscription [here](../../../client-api/data-sub
 **Include using builder**:
 
 Include statements can be added to the subscription with `ISubscriptionIncludeBuilder`.  
-This builder is assigned to the  `Includes` property in [SubscriptionCreationOptions&lt;T&gt;](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptions&lt;t&gt;).  
+This builder is assigned to the  `Includes` property in [SubscriptionCreationOptions&lt;T&gt;](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptionst).  
 It supports methods for including documents as well as [counters](../../../client-api/data-subscriptions/creation/examples.mdx#create-subscription---include-counters). 
 These methods can be chained.
 
@@ -700,7 +700,7 @@ See how to consume this type of subscription [here](../../../client-api/data-sub
 **Include using builder**:
 
 Include statements can be added to the subscription with `SubscriptionIncludeBuilder`.  
-This builder is assigned to the  `includes` property in [SubscriptionCreationOptions](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptions&lt;t&gt;).  
+This builder is assigned to the  `includes` property in [SubscriptionCreationOptions](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptionst).  
 It supports methods for including documents as well as [counters](../../../client-api/data-subscriptions/creation/examples.mdx#create-subscription---include-counters).
 These methods can be chained.  
 
diff --git a/versioned_docs/version-6.0/client-api/faq/transaction-support.mdx b/versioned_docs/version-6.0/client-api/faq/transaction-support.mdx
index cf50fc670d..feb3ea203b 100644
--- a/versioned_docs/version-6.0/client-api/faq/transaction-support.mdx
+++ b/versioned_docs/version-6.0/client-api/faq/transaction-support.mdx
@@ -174,7 +174,7 @@ If you care about avoiding lost updates, you need to ensure you have the conflic
 
 The following is an important aspect to RavenDB's transactional behavior with regards to asynchronous replication.  
 
-When replicating modifications to another server, RavenDB will ensure that the [transaction boundaries](../../server/clustering/replication/replication-overview.mdx#replication-&-transaction-boundary) are maintained.  
+When replicating modifications to another server, RavenDB will ensure that the [transaction boundaries](../../server/clustering/replication/replication-overview.mdx#replication--transaction-boundary) are maintained.  
 If there are several document modifications in the same transaction they will be sent in the same replication batch, keeping the transaction boundary on the destination as well.  
 
 However, a special attention is needed when a document is modified in two separate transactions but the replication of the first transaction has not occurred yet. 
diff --git a/versioned_docs/version-6.0/client-api/session/updating-entities.mdx b/versioned_docs/version-6.0/client-api/session/updating-entities.mdx
index f4a0148763..8e5d3dc888 100644
--- a/versioned_docs/version-6.0/client-api/session/updating-entities.mdx
+++ b/versioned_docs/version-6.0/client-api/session/updating-entities.mdx
@@ -35,8 +35,8 @@ export const supportedLanguages = ["csharp", "python", "php", "nodejs"];
 
 
 * In this page:
-    * [Load a document & update](../../client-api/session/updating-entities.mdx#load-a-document-&-update)
-    * [Query for documents & update](../../client-api/session/updating-entities.mdx#query-for-documents-&-update)
+    * [Load a document & update](../../client-api/session/updating-entities.mdx#load-a-document--update)
+    * [Query for documents & update](../../client-api/session/updating-entities.mdx#query-for-documents--update)
     
 </Admonition>
 ## Load a document & update
@@ -158,8 +158,8 @@ export const supportedLanguages = ["csharp", "python", "php", "nodejs"];
 
 
 * In this page:
-    * [Load a document & update](../../client-api/session/updating-entities.mdx#load-a-document-&-update)
-    * [Query for documents & update](../../client-api/session/updating-entities.mdx#query-for-documents-&-update)
+    * [Load a document & update](../../client-api/session/updating-entities.mdx#load-a-document--update)
+    * [Query for documents & update](../../client-api/session/updating-entities.mdx#query-for-documents--update)
     
 </Admonition>
 ## Load a document & update
@@ -236,8 +236,8 @@ export const supportedLanguages = ["csharp", "python", "php", "nodejs"];
 
 
 * In this page:
-    * [Load a document & update](../../client-api/session/updating-entities.mdx#load-a-document-&-update)
-    * [Query for documents & update](../../client-api/session/updating-entities.mdx#query-for-documents-&-update)
+    * [Load a document & update](../../client-api/session/updating-entities.mdx#load-a-document--update)
+    * [Query for documents & update](../../client-api/session/updating-entities.mdx#query-for-documents--update)
     
 </Admonition>
 ## Load a document & update
@@ -323,8 +323,8 @@ try \{
 
 
 * In this page:
-    * [Load a document & update](../../client-api/session/updating-entities.mdx#load-a-document-&-update)
-    * [Query for documents & update](../../client-api/session/updating-entities.mdx#query-for-documents-&-update)
+    * [Load a document & update](../../client-api/session/updating-entities.mdx#load-a-document--update)
+    * [Query for documents & update](../../client-api/session/updating-entities.mdx#query-for-documents--update)
 
 </Admonition>
 ## Load a document & update
diff --git a/versioned_docs/version-6.0/client-api/session/what-is-a-session-and-how-does-it-work.mdx b/versioned_docs/version-6.0/client-api/session/what-is-a-session-and-how-does-it-work.mdx
index 857a8135bf..1dba0285f5 100644
--- a/versioned_docs/version-6.0/client-api/session/what-is-a-session-and-how-does-it-work.mdx
+++ b/versioned_docs/version-6.0/client-api/session/what-is-a-session-and-how-does-it-work.mdx
@@ -31,7 +31,7 @@ export const supportedLanguages = ["csharp", "java", "python", "php", "nodejs"];
       * [Create document example](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#create-document-example)
       * [Modify document example](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#modify-document-example)
   * [Identity map pattern](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#identity-map-pattern)
-  * [Batching & Transactions](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#batching-&-transactions)
+  * [Batching & Transactions](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#batching--transactions)
   * [Concurrency control](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#concurrency-control)
   * [Reducing server calls (best practices) for:](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#reducing-server-calls-(best-practices)-for:)  
       * [The N+1 problem](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#the-select-n1-problem)    
@@ -380,7 +380,7 @@ To address this, the session API offers the concurrency control feature.
         * [Create document example](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#create-document-example)
         * [Modify document example](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#modify-document-example)
     * [Identity map pattern](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#identity-map-pattern)
-    * [Batching & Transactions](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#batching-&-transactions)
+    * [Batching & Transactions](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#batching--transactions)
     * [Concurrency control](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#concurrency-control)
     * [Reducing server calls (best practices) for:](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#reducing-server-calls-(best-practices)-for:)
         * [The N+1 problem](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#the-select-n1-problem)
@@ -669,7 +669,7 @@ To address this, the session API offers the concurrency control feature.
       * [Create document example](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#create-document-example)
       * [Modify document example](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#modify-document-example)
   * [Identity map pattern](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#identity-map-pattern)
-  * [Batching & Transactions](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#batching-&-transactions)
+  * [Batching & Transactions](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#batching--transactions)
   * [Concurrency control](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#concurrency-control)
   * [Reducing server calls (best practices) for:](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#reducing-server-calls-(best-practices)-for:)  
       * [The N+1 problem](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#the-select-n1-problem)    
@@ -953,7 +953,7 @@ To address this, the session API offers the concurrency control feature.
       * [Create document example](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#create-document-example)
       * [Modify document example](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#modify-document-example)
   * [Identity map pattern](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#identity-map-pattern)
-  * [Batching & Transactions](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#batching-&-transactions)
+  * [Batching & Transactions](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#batching--transactions)
   * [Concurrency control](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#concurrency-control)
   * [Reducing server calls (best practices) for:](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#reducing-server-calls-(best-practices)-for:)  
       * [The N+1 problem](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#the-select-n1-problem)    
@@ -1247,7 +1247,7 @@ To address this, the session API offers the concurrency control feature.
         * [Create document example](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#create-document-example)
         * [Modify document example](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#modify-document-example)
     * [Identity map pattern](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#identity-map-pattern)
-    * [Batching & Transactions](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#batching-&-transactions)
+    * [Batching & Transactions](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#batching--transactions)
     * [Concurrency control](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#concurrency-control)
     * [Reducing server calls (best practices) for:](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#reducing-server-calls-(best-practices)-for:)
         * [The N+1 problem](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#the-select-n1-problem)
diff --git a/versioned_docs/version-6.0/document-extensions/attachments/indexing.mdx b/versioned_docs/version-6.0/document-extensions/attachments/indexing.mdx
index 5c2aae2243..487b656c9c 100644
--- a/versioned_docs/version-6.0/document-extensions/attachments/indexing.mdx
+++ b/versioned_docs/version-6.0/document-extensions/attachments/indexing.mdx
@@ -31,8 +31,8 @@ export const supportedLanguages = ["csharp", "java", "python", "php", "nodejs"];
 
 * In this page:
     * [Index attachments details](../../document-extensions/attachments/indexing.mdx#index-attachments-details)
-    * [Index details & content - by attachment name](../../document-extensions/attachments/indexing.mdx#index-details-&-content---by-attachment-name)
-    * [Index details & content - all attachments](../../document-extensions/attachments/indexing.mdx#index-details-&-content---all-attachments)
+    * [Index details & content - by attachment name](../../document-extensions/attachments/indexing.mdx#index-details--content---by-attachment-name)
+    * [Index details & content - all attachments](../../document-extensions/attachments/indexing.mdx#index-details--content---all-attachments)
     * [Leveraging indexed attachments](../../document-extensions/attachments/indexing.mdx#leveraging-indexed-attachments)
     * [Syntax](../../document-extensions/attachments/indexing.mdx#syntax)
 
@@ -47,7 +47,7 @@ export const supportedLanguages = ["csharp", "java", "python", "php", "nodejs"];
   These details can then be used when defining the index-fields.
   Once the index is deployed, you can query the index to find Employee documents based on these attachment properties.
 
-* To index **attachments' content**, see the examples [below](../../document-extensions/attachments/indexing.mdx#index-details-&-content---by-attachment-name).
+* To index **attachments' content**, see the examples [below](../../document-extensions/attachments/indexing.mdx#index-details--content---by-attachment-name).
 
 <Tabs groupId='languageSyntax'>
 <TabItem value="LINQ_index" label="LINQ_index">
@@ -1339,8 +1339,8 @@ $employees = $session
 
 * In this page:  
   * [Index attachments details](../../document-extensions/attachments/indexing.mdx#index-attachments-details)
-  * [Index details & content - by attachment name](../../document-extensions/attachments/indexing.mdx#index-details-&-content---by-attachment-name)
-  * [Index details & content - all attachments](../../document-extensions/attachments/indexing.mdx#index-details-&-content---all-attachments)
+  * [Index details & content - by attachment name](../../document-extensions/attachments/indexing.mdx#index-details--content---by-attachment-name)
+  * [Index details & content - all attachments](../../document-extensions/attachments/indexing.mdx#index-details--content---all-attachments)
   * [Leveraging indexed attachments](../../document-extensions/attachments/indexing.mdx#leveraging-indexed-attachments)
   * [Syntax](../../document-extensions/attachments/indexing.mdx#syntax)
 
@@ -1356,7 +1356,7 @@ $employees = $session
   These details can then be used when defining the index-fields.
   Once the index is deployed, you can query the index to find Employee documents based on these attachment properties.
 
-* To index **attachments' content**, see the examples [below](../../document-extensions/attachments/indexing.mdx#index-details-&-content---by-attachment-name).
+* To index **attachments' content**, see the examples [below](../../document-extensions/attachments/indexing.mdx#index-details--content---by-attachment-name).
 
 <TabItem value="index_1" label="index_1">
 <CodeBlock language="js">
diff --git a/versioned_docs/version-6.0/indexes/multi-map-indexes.mdx b/versioned_docs/version-6.0/indexes/multi-map-indexes.mdx
index 32e13c5096..c8aff3d301 100644
--- a/versioned_docs/version-6.0/indexes/multi-map-indexes.mdx
+++ b/versioned_docs/version-6.0/indexes/multi-map-indexes.mdx
@@ -28,7 +28,7 @@ export const supportedLanguages = ["csharp", "java", "python", "php", "nodejs"];
   Learn how to [create Multi-Map-Reduce indexes](../indexes/map-reduce-indexes.mdx#creating-multi-map-reduce-indexes)  
 
 * In this page:
-  * [AddMap & AddMapForAll](../indexes/multi-map-indexes.mdx#addmap-&-addmapforall)
+  * [AddMap & AddMapForAll](../indexes/multi-map-indexes.mdx#addmap--addmapforall)
   * [Searching across multiple collections](../indexes/multi-map-indexes.mdx#searching-across-multiple-collections)
   * [Remarks](../indexes/multi-map-indexes.mdx#remarks)
 
diff --git a/versioned_docs/version-6.0/indexes/using-dynamic-fields.mdx b/versioned_docs/version-6.0/indexes/using-dynamic-fields.mdx
index 6c5cca18ba..8f8e49760c 100644
--- a/versioned_docs/version-6.0/indexes/using-dynamic-fields.mdx
+++ b/versioned_docs/version-6.0/indexes/using-dynamic-fields.mdx
@@ -42,7 +42,7 @@ export const supportedLanguages = ["csharp", "java", "python", "php", "nodejs"];
         * [Example - basic](../indexes/using-dynamic-fields.mdx#example---basic)
         * [Example - list](../indexes/using-dynamic-fields.mdx#example---list)
     * [CreateField syntax](../indexes/using-dynamic-fields.mdx#createfield-syntax)
-    * [Indexed fields & terms view](../indexes/using-dynamic-fields.mdx#indexed-fields-&-terms-view)
+    * [Indexed fields & terms view](../indexes/using-dynamic-fields.mdx#indexed-fields--terms-view)
 
 </Admonition>
 
@@ -604,7 +604,7 @@ Below are sample index fields & their terms generated from the last example.
         * [Example - basic](../indexes/using-dynamic-fields.mdx#example---basic)
         * [Example - list](../indexes/using-dynamic-fields.mdx#example---list)
     * [CreateField syntax](../indexes/using-dynamic-fields.mdx#createfield-syntax)
-    * [Indexed fields & terms view](../indexes/using-dynamic-fields.mdx#indexed-fields-&-terms-view)
+    * [Indexed fields & terms view](../indexes/using-dynamic-fields.mdx#indexed-fields--terms-view)
 
 </Admonition>
 
@@ -1090,7 +1090,7 @@ Below are sample index fields & their terms generated from the last example.
         * [Example - basic](../indexes/using-dynamic-fields.mdx#example---basic)
         * [Example - list](../indexes/using-dynamic-fields.mdx#example---list)
     * [CreateField syntax](../indexes/using-dynamic-fields.mdx#createfield-syntax)
-    * [Indexed fields & terms view](../indexes/using-dynamic-fields.mdx#indexed-fields-&-terms-view)
+    * [Indexed fields & terms view](../indexes/using-dynamic-fields.mdx#indexed-fields--terms-view)
 
 </Admonition>
 
@@ -1608,7 +1608,7 @@ Below are sample index fields & their terms generated from the last example.
         * [Example - basic](../indexes/using-dynamic-fields.mdx#example---basic)
         * [Example - list](../indexes/using-dynamic-fields.mdx#example---list)
     * [CreateField syntax](../indexes/using-dynamic-fields.mdx#createfield-syntax)
-    * [Indexed fields & terms view](../indexes/using-dynamic-fields.mdx#indexed-fields-&-terms-view)
+    * [Indexed fields & terms view](../indexes/using-dynamic-fields.mdx#indexed-fields--terms-view)
 
 </Admonition>
 
@@ -2174,7 +2174,7 @@ Below are sample index fields & their terms generated from the last example.
         * [Example - basic](../indexes/using-dynamic-fields.mdx#example---basic)
         * [Example - list](../indexes/using-dynamic-fields.mdx#example---list)
     * [CreateField syntax](../indexes/using-dynamic-fields.mdx#createfield-syntax)
-    * [Indexed fields & terms view](../indexes/using-dynamic-fields.mdx#indexed-fields-&-terms-view)
+    * [Indexed fields & terms view](../indexes/using-dynamic-fields.mdx#indexed-fields--terms-view)
 
 </Admonition>
 
diff --git a/versioned_docs/version-6.0/migration/server/server-breaking-changes.mdx b/versioned_docs/version-6.0/migration/server/server-breaking-changes.mdx
index 4160040306..2bf1a4744a 100644
--- a/versioned_docs/version-6.0/migration/server/server-breaking-changes.mdx
+++ b/versioned_docs/version-6.0/migration/server/server-breaking-changes.mdx
@@ -24,7 +24,7 @@ import LanguageContent from "@site/src/components/LanguageContent";
   * [Unsupported sharding features](../../migration/server/server-breaking-changes.mdx#unsupported-sharding-features)
   * [Graph queries](../../migration/server/server-breaking-changes.mdx#graph-queries)
   * [SQL ETL](../../migration/server/server-breaking-changes.mdx#sql-etl)
-  * [DateOnly & TimeOnly](../../migration/server/server-breaking-changes.mdx#dateonly-&-timeonly)
+  * [DateOnly & TimeOnly](../../migration/server/server-breaking-changes.mdx#dateonly--timeonly)
   * [Full-text search with wildcards](../../migration/server/server-breaking-changes.mdx#full-text-search-with-wildcards)
 
 </Admonition>
diff --git a/versioned_docs/version-6.0/server/clustering/distribution/cluster-observer.mdx b/versioned_docs/version-6.0/server/clustering/distribution/cluster-observer.mdx
index bdae6ae0cd..5b27451f08 100644
--- a/versioned_docs/version-6.0/server/clustering/distribution/cluster-observer.mdx
+++ b/versioned_docs/version-6.0/server/clustering/distribution/cluster-observer.mdx
@@ -42,7 +42,7 @@ The _Cluster Observer_ stores its information **in memory**, so when the `Leader
 
 | URL | Method | Query Params. | Description |
 | - | - | - | - |
-| `/admin/cluster/observer/suspend` | POST | value=[`bool`] | Setting `false` will suspend the _Cluster Observer_ operation for the current [Leader term](../../../studio/cluster/cluster-view.mdx#cluster-nodes-states-&-types-flow). |
+| `/admin/cluster/observer/suspend` | POST | value=[`bool`] | Setting `false` will suspend the _Cluster Observer_ operation for the current [Leader term](../../../studio/cluster/cluster-view.mdx#cluster-nodes-states--types-flow). |
 | `/admin/cluster/observer/decisions` | GET | | Fetch the log of the recent decisions made by the cluster observer. |
 | `/admin/cluster/maintenance-stats` | GET | | Fetch the latest reports of the _Cluster Observer_ |
 
diff --git a/versioned_docs/version-6.0/server/clustering/distribution/distributed-database.mdx b/versioned_docs/version-6.0/server/clustering/distribution/distributed-database.mdx
index 932216a41e..cc736f52ee 100644
--- a/versioned_docs/version-6.0/server/clustering/distribution/distributed-database.mdx
+++ b/versioned_docs/version-6.0/server/clustering/distribution/distributed-database.mdx
@@ -75,7 +75,7 @@ Each **Database Node** can be in one of the following states:
   The new node will be in a `Promotable` state until it receives _and_ indexes all the documents from the mentor node.  
 * Learn more in:  
   * [Cluster node types](../../../studio/cluster/cluster-view.mdx#cluster-nodes-types)
-  * [Cluster node states and types flow](../../../studio/cluster/cluster-view.mdx#cluster-nodes-states-&-types-flow)
+  * [Cluster node states and types flow](../../../studio/cluster/cluster-view.mdx#cluster-nodes-states--types-flow)
 
 </Admonition>
 
diff --git a/versioned_docs/version-6.0/server/clustering/replication/replication-overview.mdx b/versioned_docs/version-6.0/server/clustering/replication/replication-overview.mdx
index 72ca81e70e..3f08dc1d67 100644
--- a/versioned_docs/version-6.0/server/clustering/replication/replication-overview.mdx
+++ b/versioned_docs/version-6.0/server/clustering/replication/replication-overview.mdx
@@ -32,7 +32,7 @@ import LanguageContent from "@site/src/components/LanguageContent";
       * [Hub/Sink replication](../../../server/clustering/replication/replication-overview.mdx#hubsink-replication)
     * [What is replicated](../../../server/clustering/replication/replication-overview.mdx#what-is-replicated)  
     * [How replication works](../../../server/clustering/replication/replication-overview.mdx#how-replication-works)  
-    * [Replication & transaction boundary](../../../server/clustering/replication/replication-overview.mdx#replication-&-transaction-boundary)  
+    * [Replication & transaction boundary](../../../server/clustering/replication/replication-overview.mdx#replication--transaction-boundary)  
 
 </Admonition>
 ## Replication types
diff --git a/versioned_docs/version-6.0/sharding/migration.mdx b/versioned_docs/version-6.0/sharding/migration.mdx
index 1b7d213fb7..1246d9bf9c 100644
--- a/versioned_docs/version-6.0/sharding/migration.mdx
+++ b/versioned_docs/version-6.0/sharding/migration.mdx
@@ -32,7 +32,7 @@ database to the new one in several ways.
   of the replica.  
 
 * In this page:  
-  * [Export & Import](../sharding/migration.mdx#export-&-import)  
+  * [Export & Import](../sharding/migration.mdx#export--import)  
   * [Backup](../sharding/migration.mdx#backup)  
   * [External Replication](../sharding/migration.mdx#external-replication)  
 
diff --git a/versioned_docs/version-6.0/sharding/subscriptions.mdx b/versioned_docs/version-6.0/sharding/subscriptions.mdx
index 3149e6480a..a56b035a6b 100644
--- a/versioned_docs/version-6.0/sharding/subscriptions.mdx
+++ b/versioned_docs/version-6.0/sharding/subscriptions.mdx
@@ -95,7 +95,7 @@ Data subscriptions features that are not supported yet under a sharded database:
   Allowing multiple workers to connect a common subscription simultaneously.  
 * [Data Subscriptions Revisions Support](../client-api/data-subscriptions/advanced-topics/subscription-with-revisioning.mdx)  
   Subscribing to document revisions.  
-* [SubscriptionCreationOptions.ChangeVector](../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptions&lt;t&gt;)  
+* [SubscriptionCreationOptions.ChangeVector](../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptionst)  
   Providing an arbitrary change vector from which the subscription would start processing 
   is currently not supported.  
   <Admonition type="note" title="">
diff --git a/versioned_docs/version-6.0/start/installation/setup-wizard.mdx b/versioned_docs/version-6.0/start/installation/setup-wizard.mdx
index ebb0528394..3b0787ba5c 100644
--- a/versioned_docs/version-6.0/start/installation/setup-wizard.mdx
+++ b/versioned_docs/version-6.0/start/installation/setup-wizard.mdx
@@ -661,7 +661,7 @@ In the **Unsecure Mode**, all you need to do is specify the **IP address** and *
                    This new cluster will only contain this node.  
    * **Unchecked** - The server will Not be created in a cluster.  
                      The server will be created in a 
-                     [Passive State](../../studio/cluster/cluster-view.mdx#cluster-nodes-states-&-types-flow) 
+                     [Passive State](../../studio/cluster/cluster-view.mdx#cluster-nodes-states--types-flow) 
                      and can later be added to an already existing cluster.  
 
 4. **Environment**  
diff --git a/versioned_docs/version-6.0/start/licensing/renew-license.mdx b/versioned_docs/version-6.0/start/licensing/renew-license.mdx
index 4de1e81a5e..e237e84d40 100644
--- a/versioned_docs/version-6.0/start/licensing/renew-license.mdx
+++ b/versioned_docs/version-6.0/start/licensing/renew-license.mdx
@@ -24,7 +24,7 @@ import LanguageContent from "@site/src/components/LanguageContent";
 
 * In this page:
     * [Renew commercial licenses](../../start/licensing/renew-license.mdx#renew-commercial-licenses)
-    * [Renew Developer & Community licenses](../../start/licensing/renew-license.mdx#renew-developer-&-community-licenses)
+    * [Renew Developer & Community licenses](../../start/licensing/renew-license.mdx#renew-developer--community-licenses)
 
 </Admonition>
 ## Renew commercial licenses
diff --git a/versioned_docs/version-6.0/studio/cluster/cluster-view.mdx b/versioned_docs/version-6.0/studio/cluster/cluster-view.mdx
index 51f7e5e122..2d539e56b5 100644
--- a/versioned_docs/version-6.0/studio/cluster/cluster-view.mdx
+++ b/versioned_docs/version-6.0/studio/cluster/cluster-view.mdx
@@ -34,7 +34,7 @@ import LanguageContent from "@site/src/components/LanguageContent";
   * [Cluster View Operations](../../studio/cluster/cluster-view.mdx#cluster-view-operations)  
   * [Reassign Cores](../../studio/cluster/cluster-view.mdx#reassign-cores)  
   * [Cluster Nodes Types](../../studio/cluster/cluster-view.mdx#cluster-nodes-types)  
-  * [Cluster Nodes States & Types Flow](../../studio/cluster/cluster-view.mdx#cluster-nodes-states-&-types-flow)  
+  * [Cluster Nodes States & Types Flow](../../studio/cluster/cluster-view.mdx#cluster-nodes-states--types-flow)  
   * [Cluster-Wide operation -vs- Database Operations](../../studio/cluster/cluster-view.mdx#cluster-wide-operation--vs--database-operations)  
 </Admonition>
 ## Cluster View Stats
diff --git a/versioned_docs/version-6.0/studio/database/indexes/create-map-index.mdx b/versioned_docs/version-6.0/studio/database/indexes/create-map-index.mdx
index f47ef2385a..db556daae3 100644
--- a/versioned_docs/version-6.0/studio/database/indexes/create-map-index.mdx
+++ b/versioned_docs/version-6.0/studio/database/indexes/create-map-index.mdx
@@ -21,7 +21,7 @@ import LanguageContent from "@site/src/components/LanguageContent";
 * In this page:  
   * [Edit Index View](../../../studio/database/indexes/create-map-index.mdx#edit-index-view)  
   * [Test Index](../../../studio/database/indexes/create-map-index.mdx#test-index)  
-  * [Index Fields & Terms](../../../studio/database/indexes/create-map-index.mdx#index-fields-&-terms)  
+  * [Index Fields & Terms](../../../studio/database/indexes/create-map-index.mdx#index-fields--terms)  
   * [Index Field Options](../../../studio/database/indexes/create-map-index.mdx#index-field-options)  
      * [Add Compound Field](../../../studio/database/indexes/create-map-index.mdx#add-compound-field)  
   * [Configuration](../../../studio/database/indexes/create-map-index.mdx#configuration)  
@@ -41,7 +41,7 @@ import LanguageContent from "@site/src/components/LanguageContent";
 2. Options available for an already saved index:  
    **Copy C#** - Click to view and copy the C# class that defines the index as set in the Studio.  
    **Query** - Click to go the the Query View and query this index.  
-   **Terms** - Click to see the index terms, see [below](../../../studio/database/indexes/create-map-index.mdx#index-fields-&-terms).  
+   **Terms** - Click to see the index terms, see [below](../../../studio/database/indexes/create-map-index.mdx#index-fields--terms).  
    **Advanced** - Click to dump the raw index or optimize it.  
    **Delete** - Delete this index.  
 
diff --git a/versioned_docs/version-6.2/client-api/commands/documents/delete.mdx b/versioned_docs/version-6.2/client-api/commands/documents/delete.mdx
index 60b97e52ea..430737f570 100644
--- a/versioned_docs/version-6.2/client-api/commands/documents/delete.mdx
+++ b/versioned_docs/version-6.2/client-api/commands/documents/delete.mdx
@@ -159,7 +159,7 @@ catch (Exception e)
 | Parameter        | Type     | Description                                                                                                                                                                                                                                             |
 |------------------|----------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | **id**           | `string` | The ID of the document to delete.                                                                                                                                                                                                                       |
-| **changeVector** | `string` | The change-vector of the document you wish to delete,<br/>used for [optimistic concurrency control](../../../server/clustering/replication/change-vector.mdx#concurrency-control-&-change-vectors).<br/>Pass `null` to skip the check and force the deletion. |
+| **changeVector** | `string` | The change-vector of the document you wish to delete,<br/>used for [optimistic concurrency control](../../../server/clustering/replication/change-vector.mdx#concurrency-control--change-vectors).<br/>Pass `null` to skip the check and force the deletion. |
 
 
 
@@ -376,7 +376,7 @@ catch (err) \{
 | Parameter        | Type     | Description                                                                                                                                                                                                                                             |
 |------------------|----------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | **id**           | `string` | The ID of the document to delete.                                                                                                                                                                                                                       |
-| **changeVector** | `string` | The change-vector of the document you wish to delete,<br/>used for [optimistic concurrency control](../../../server/clustering/replication/change-vector.mdx#concurrency-control-&-change-vectors).<br/>Pass `null` to skip the check and force the deletion. |
+| **changeVector** | `string` | The change-vector of the document you wish to delete,<br/>used for [optimistic concurrency control](../../../server/clustering/replication/change-vector.mdx#concurrency-control--change-vectors).<br/>Pass `null` to skip the check and force the deletion. |
 
 
 
diff --git a/versioned_docs/version-6.2/client-api/commands/documents/put.mdx b/versioned_docs/version-6.2/client-api/commands/documents/put.mdx
index bbb24eb9f5..0ed48b248c 100644
--- a/versioned_docs/version-6.2/client-api/commands/documents/put.mdx
+++ b/versioned_docs/version-6.2/client-api/commands/documents/put.mdx
@@ -193,7 +193,7 @@ var theDocumentCV = putResult.ChangeVector;
 | Parameter        | Type                        | Description                                                                                                                                                                                                                                          |
 |------------------|-----------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | **id**           | `string`                    | Unique ID under which document will be stored.                                                                                                                                                                                                       |
-| **changeVector** | `string`                    | The change-vector of the document you wish to update,<br/>used for [optimistic concurrency control](../../../server/clustering/replication/change-vector.mdx#concurrency-control-&-change-vectors).<br/>Pass `null` to skip the check and force the 'put'. |
+| **changeVector** | `string`                    | The change-vector of the document you wish to update,<br/>used for [optimistic concurrency control](../../../server/clustering/replication/change-vector.mdx#concurrency-control--change-vectors).<br/>Pass `null` to skip the check and force the 'put'. |
 | **document**     | `BlittableJsonReaderObject` | The document to store. Use:<br/>`session.Advanced.JsonConverter.ToBlittable(doc, docInfo);` to convert your entity to a `BlittableJsonReaderObject`.                                                                                                  |
 
 <TabItem value="syntax_2" label="syntax_2">
@@ -478,7 +478,7 @@ assert.strictEqual(theDocumentID, "categories/999");
 | Parameter        | Type     | Description                                                                                                                                                                                                                                          |
 |------------------|----------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | **id**           | `string` | Unique ID under which document will be stored.                                                                                                                                                                                                       |
-| **changeVector** | `string` | The change-vector of the document you wish to update,<br/>used for [optimistic concurrency control](../../../server/clustering/replication/change-vector.mdx#concurrency-control-&-change-vectors).<br/>Pass `null` to skip the check and force the 'put'. |
+| **changeVector** | `string` | The change-vector of the document you wish to update,<br/>used for [optimistic concurrency control](../../../server/clustering/replication/change-vector.mdx#concurrency-control--change-vectors).<br/>Pass `null` to skip the check and force the 'put'. |
 | **document**     | `object` | The document to store.                                                                                                                                                                                                                               |
 
 <TabItem value="syntax_2" label="syntax_2">
diff --git a/versioned_docs/version-6.2/client-api/data-subscriptions/consumption/api-overview.mdx b/versioned_docs/version-6.2/client-api/data-subscriptions/consumption/api-overview.mdx
index 697cbb83d1..963d017485 100644
--- a/versioned_docs/version-6.2/client-api/data-subscriptions/consumption/api-overview.mdx
+++ b/versioned_docs/version-6.2/client-api/data-subscriptions/consumption/api-overview.mdx
@@ -25,9 +25,9 @@ export const supportedLanguages = ["csharp", "java", "python", "nodejs"];
    * [Create the subscription worker](../../../client-api/data-subscriptions/consumption/api-overview.mdx#create-the-subscription-worker)  
    * [SubscriptionWorkerOptions](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworkeroptions)  
    * [Run the subscription worker](../../../client-api/data-subscriptions/consumption/api-overview.mdx#run-the-subscription-worker)  
-   * [SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatch&lt;t&gt;)  
-   * [SubscriptionBatch&lt;T&gt;.Item](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatch&lt;t&gt;item)  
-   * [SubscriptionWorker&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworker&lt;t&gt;)  
+   * [SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatcht)  
+   * [SubscriptionBatch&lt;T&gt;.Item](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatchtitem)  
+   * [SubscriptionWorker&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworkert)  
 
 </Admonition>
 ## Create the subscription worker
@@ -129,7 +129,7 @@ Learn more about `SubscriptionOpeningStrategy` in [worker strategies](../../../c
 ## Run the subscription worker
 
 After [creating](../../../client-api/data-subscriptions/consumption/api-overview.mdx#create-the-subscription-worker) a subscription worker, the subscription worker is still not processing any documents.  
-To start processing, you need to call the `Run` method of the [SubscriptionWorker](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworker&lt;t&gt;).  
+To start processing, you need to call the `Run` method of the [SubscriptionWorker](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworkert).  
 
 The `Run` function takes a delegate, which is your client-side code responsible for processing the received document batches.
 
@@ -160,7 +160,7 @@ Task Run(Func<SubscriptionBatch<T>, Task> processDocuments,
 
 | Member                   | Type                              | Description                                                                                                                                                            |
 |--------------------------|-----------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| **Items**                | `List<SubscriptionBatch<T>.Item>` | List of items in the batch.<br/>See [SubscriptionBatch&lt;T&gt;.Item](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatch&lt;t&gt;item) below. |
+| **Items**                | `List<SubscriptionBatch<T>.Item>` | List of items in the batch.<br/>See [SubscriptionBatch&lt;T&gt;.Item](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatchtitem) below. |
 | **NumberOfItemsInBatch** | `int`                             | Number of items in the batch.                                                                                                                                          |
 
 | Method Signature       | Return value            | Description                                                                                                       |
@@ -285,8 +285,8 @@ Using it outside this scope may cause unexpected behavior.
    * [Create the subscription worker](../../../client-api/data-subscriptions/consumption/api-overview.mdx#create-the-subscription-worker)
    * [SubscriptionWorkerOptions](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworkeroptions)  
    * [Run the subscription worker](../../../client-api/data-subscriptions/consumption/api-overview.mdx#run-the-subscription-worker)  
-   * [SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatch&lt;t&gt;)  
-   * [SubscriptionWorker&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworker&lt;t&gt;)  
+   * [SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatcht)  
+   * [SubscriptionWorker&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworkert)  
 
 </Admonition>
 ## Create the subscription worker
@@ -350,7 +350,7 @@ All other parameters are optional and will default to their respective default v
 ## Run the subscription worker
 
 After [creating](../../../client-api/data-subscriptions/consumption/api-overview.mdx#create-the-subscription-worker) a subscription worker, the subscription worker is still not processing any documents.  
-To start processing, you need to call the `run` method of the [SubscriptionWorker](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworker&lt;t&gt;).
+To start processing, you need to call the `run` method of the [SubscriptionWorker](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworkert).
 
 The `run` function takes a delegate, which is your client-side code responsible for processing the received document batches.
 
diff --git a/versioned_docs/version-6.2/client-api/data-subscriptions/creation/api-overview.mdx b/versioned_docs/version-6.2/client-api/data-subscriptions/creation/api-overview.mdx
index 8eeb7aeec2..ab2e3f2168 100644
--- a/versioned_docs/version-6.2/client-api/data-subscriptions/creation/api-overview.mdx
+++ b/versioned_docs/version-6.2/client-api/data-subscriptions/creation/api-overview.mdx
@@ -23,7 +23,7 @@ export const supportedLanguages = ["csharp", "python", "nodejs"];
 
 * In this page:  
    * [Create subscription](../../../client-api/data-subscriptions/creation/api-overview.mdx#create-subscription)
-   * [SubscriptionCreationOptions&lt;T&gt;](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptions&lt;t&gt;)
+   * [SubscriptionCreationOptions&lt;T&gt;](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptionst)
    * [SubscriptionCreationOptions](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptions)  
    * [Update subscription](../../../client-api/data-subscriptions/creation/api-overview.mdx#update-subscription)  
    * [SubscriptionUpdateOptions](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptionupdateoptions)  
@@ -72,7 +72,7 @@ Task<string> CreateAsync<T>(Expression<Func<T, bool>> predicate = null,
 | Parameter      | Type                             | Description                                                                                                                                                                                  |
 |----------------|----------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | **predicate**  | `Expression<Func<T, bool>>`      | An optional lambda expression that returns a boolean.<br/>This predicate defines the filter criteria for the subscription documents.                                                          |
-| **options**    | `SubscriptionCreationOptions<T>` | Contains subscription creation options.<br/>See [SubscriptionCreationOptions&lt;T&gt;](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptions&lt;t&gt;)           |
+| **options**    | `SubscriptionCreationOptions<T>` | Contains subscription creation options.<br/>See [SubscriptionCreationOptions&lt;T&gt;](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptionst)           |
 | **options**    | `SubscriptionCreationOptions`    | Contains subscription creation options - non-generic version.<br/>See [SubscriptionCreationOptions](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptions) |
 | **database**   | `string`                         | The name of the database where the subscription task will be created. If `null`, the default database configured in the DocumentStore will be used.                                          |
 | **token**      | `CancellationToken`              | Cancellation token used in to halt the subscription creation process.                                                                                                                  |
diff --git a/versioned_docs/version-6.2/client-api/data-subscriptions/creation/examples.mdx b/versioned_docs/version-6.2/client-api/data-subscriptions/creation/examples.mdx
index 1914e600aa..d30f03a020 100644
--- a/versioned_docs/version-6.2/client-api/data-subscriptions/creation/examples.mdx
+++ b/versioned_docs/version-6.2/client-api/data-subscriptions/creation/examples.mdx
@@ -278,7 +278,7 @@ See how to consume this type of subscription [here](../../../client-api/data-sub
 **Include using builder**:
 
 Include statements can be added to the subscription with `ISubscriptionIncludeBuilder`.  
-This builder is assigned to the  `Includes` property in [SubscriptionCreationOptions&lt;T&gt;](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptions&lt;t&gt;).  
+This builder is assigned to the  `Includes` property in [SubscriptionCreationOptions&lt;T&gt;](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptionst).  
 It supports methods for including documents as well as [counters](../../../client-api/data-subscriptions/creation/examples.mdx#create-subscription---include-counters). 
 These methods can be chained.
 
@@ -700,7 +700,7 @@ See how to consume this type of subscription [here](../../../client-api/data-sub
 **Include using builder**:
 
 Include statements can be added to the subscription with `SubscriptionIncludeBuilder`.  
-This builder is assigned to the  `includes` property in [SubscriptionCreationOptions](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptions&lt;t&gt;).  
+This builder is assigned to the  `includes` property in [SubscriptionCreationOptions](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptionst).  
 It supports methods for including documents as well as [counters](../../../client-api/data-subscriptions/creation/examples.mdx#create-subscription---include-counters).
 These methods can be chained.  
 
diff --git a/versioned_docs/version-6.2/client-api/faq/transaction-support.mdx b/versioned_docs/version-6.2/client-api/faq/transaction-support.mdx
index cf50fc670d..feb3ea203b 100644
--- a/versioned_docs/version-6.2/client-api/faq/transaction-support.mdx
+++ b/versioned_docs/version-6.2/client-api/faq/transaction-support.mdx
@@ -174,7 +174,7 @@ If you care about avoiding lost updates, you need to ensure you have the conflic
 
 The following is an important aspect to RavenDB's transactional behavior with regards to asynchronous replication.  
 
-When replicating modifications to another server, RavenDB will ensure that the [transaction boundaries](../../server/clustering/replication/replication-overview.mdx#replication-&-transaction-boundary) are maintained.  
+When replicating modifications to another server, RavenDB will ensure that the [transaction boundaries](../../server/clustering/replication/replication-overview.mdx#replication--transaction-boundary) are maintained.  
 If there are several document modifications in the same transaction they will be sent in the same replication batch, keeping the transaction boundary on the destination as well.  
 
 However, a special attention is needed when a document is modified in two separate transactions but the replication of the first transaction has not occurred yet. 
diff --git a/versioned_docs/version-6.2/client-api/session/updating-entities.mdx b/versioned_docs/version-6.2/client-api/session/updating-entities.mdx
index f4a0148763..8e5d3dc888 100644
--- a/versioned_docs/version-6.2/client-api/session/updating-entities.mdx
+++ b/versioned_docs/version-6.2/client-api/session/updating-entities.mdx
@@ -35,8 +35,8 @@ export const supportedLanguages = ["csharp", "python", "php", "nodejs"];
 
 
 * In this page:
-    * [Load a document & update](../../client-api/session/updating-entities.mdx#load-a-document-&-update)
-    * [Query for documents & update](../../client-api/session/updating-entities.mdx#query-for-documents-&-update)
+    * [Load a document & update](../../client-api/session/updating-entities.mdx#load-a-document--update)
+    * [Query for documents & update](../../client-api/session/updating-entities.mdx#query-for-documents--update)
     
 </Admonition>
 ## Load a document & update
@@ -158,8 +158,8 @@ export const supportedLanguages = ["csharp", "python", "php", "nodejs"];
 
 
 * In this page:
-    * [Load a document & update](../../client-api/session/updating-entities.mdx#load-a-document-&-update)
-    * [Query for documents & update](../../client-api/session/updating-entities.mdx#query-for-documents-&-update)
+    * [Load a document & update](../../client-api/session/updating-entities.mdx#load-a-document--update)
+    * [Query for documents & update](../../client-api/session/updating-entities.mdx#query-for-documents--update)
     
 </Admonition>
 ## Load a document & update
@@ -236,8 +236,8 @@ export const supportedLanguages = ["csharp", "python", "php", "nodejs"];
 
 
 * In this page:
-    * [Load a document & update](../../client-api/session/updating-entities.mdx#load-a-document-&-update)
-    * [Query for documents & update](../../client-api/session/updating-entities.mdx#query-for-documents-&-update)
+    * [Load a document & update](../../client-api/session/updating-entities.mdx#load-a-document--update)
+    * [Query for documents & update](../../client-api/session/updating-entities.mdx#query-for-documents--update)
     
 </Admonition>
 ## Load a document & update
@@ -323,8 +323,8 @@ try \{
 
 
 * In this page:
-    * [Load a document & update](../../client-api/session/updating-entities.mdx#load-a-document-&-update)
-    * [Query for documents & update](../../client-api/session/updating-entities.mdx#query-for-documents-&-update)
+    * [Load a document & update](../../client-api/session/updating-entities.mdx#load-a-document--update)
+    * [Query for documents & update](../../client-api/session/updating-entities.mdx#query-for-documents--update)
 
 </Admonition>
 ## Load a document & update
diff --git a/versioned_docs/version-6.2/client-api/session/what-is-a-session-and-how-does-it-work.mdx b/versioned_docs/version-6.2/client-api/session/what-is-a-session-and-how-does-it-work.mdx
index 857a8135bf..1dba0285f5 100644
--- a/versioned_docs/version-6.2/client-api/session/what-is-a-session-and-how-does-it-work.mdx
+++ b/versioned_docs/version-6.2/client-api/session/what-is-a-session-and-how-does-it-work.mdx
@@ -31,7 +31,7 @@ export const supportedLanguages = ["csharp", "java", "python", "php", "nodejs"];
       * [Create document example](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#create-document-example)
       * [Modify document example](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#modify-document-example)
   * [Identity map pattern](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#identity-map-pattern)
-  * [Batching & Transactions](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#batching-&-transactions)
+  * [Batching & Transactions](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#batching--transactions)
   * [Concurrency control](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#concurrency-control)
   * [Reducing server calls (best practices) for:](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#reducing-server-calls-(best-practices)-for:)  
       * [The N+1 problem](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#the-select-n1-problem)    
@@ -380,7 +380,7 @@ To address this, the session API offers the concurrency control feature.
         * [Create document example](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#create-document-example)
         * [Modify document example](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#modify-document-example)
     * [Identity map pattern](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#identity-map-pattern)
-    * [Batching & Transactions](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#batching-&-transactions)
+    * [Batching & Transactions](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#batching--transactions)
     * [Concurrency control](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#concurrency-control)
     * [Reducing server calls (best practices) for:](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#reducing-server-calls-(best-practices)-for:)
         * [The N+1 problem](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#the-select-n1-problem)
@@ -669,7 +669,7 @@ To address this, the session API offers the concurrency control feature.
       * [Create document example](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#create-document-example)
       * [Modify document example](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#modify-document-example)
   * [Identity map pattern](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#identity-map-pattern)
-  * [Batching & Transactions](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#batching-&-transactions)
+  * [Batching & Transactions](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#batching--transactions)
   * [Concurrency control](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#concurrency-control)
   * [Reducing server calls (best practices) for:](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#reducing-server-calls-(best-practices)-for:)  
       * [The N+1 problem](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#the-select-n1-problem)    
@@ -953,7 +953,7 @@ To address this, the session API offers the concurrency control feature.
       * [Create document example](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#create-document-example)
       * [Modify document example](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#modify-document-example)
   * [Identity map pattern](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#identity-map-pattern)
-  * [Batching & Transactions](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#batching-&-transactions)
+  * [Batching & Transactions](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#batching--transactions)
   * [Concurrency control](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#concurrency-control)
   * [Reducing server calls (best practices) for:](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#reducing-server-calls-(best-practices)-for:)  
       * [The N+1 problem](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#the-select-n1-problem)    
@@ -1247,7 +1247,7 @@ To address this, the session API offers the concurrency control feature.
         * [Create document example](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#create-document-example)
         * [Modify document example](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#modify-document-example)
     * [Identity map pattern](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#identity-map-pattern)
-    * [Batching & Transactions](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#batching-&-transactions)
+    * [Batching & Transactions](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#batching--transactions)
     * [Concurrency control](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#concurrency-control)
     * [Reducing server calls (best practices) for:](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#reducing-server-calls-(best-practices)-for:)
         * [The N+1 problem](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#the-select-n1-problem)
diff --git a/versioned_docs/version-6.2/document-extensions/attachments/indexing.mdx b/versioned_docs/version-6.2/document-extensions/attachments/indexing.mdx
index 5c2aae2243..487b656c9c 100644
--- a/versioned_docs/version-6.2/document-extensions/attachments/indexing.mdx
+++ b/versioned_docs/version-6.2/document-extensions/attachments/indexing.mdx
@@ -31,8 +31,8 @@ export const supportedLanguages = ["csharp", "java", "python", "php", "nodejs"];
 
 * In this page:
     * [Index attachments details](../../document-extensions/attachments/indexing.mdx#index-attachments-details)
-    * [Index details & content - by attachment name](../../document-extensions/attachments/indexing.mdx#index-details-&-content---by-attachment-name)
-    * [Index details & content - all attachments](../../document-extensions/attachments/indexing.mdx#index-details-&-content---all-attachments)
+    * [Index details & content - by attachment name](../../document-extensions/attachments/indexing.mdx#index-details--content---by-attachment-name)
+    * [Index details & content - all attachments](../../document-extensions/attachments/indexing.mdx#index-details--content---all-attachments)
     * [Leveraging indexed attachments](../../document-extensions/attachments/indexing.mdx#leveraging-indexed-attachments)
     * [Syntax](../../document-extensions/attachments/indexing.mdx#syntax)
 
@@ -47,7 +47,7 @@ export const supportedLanguages = ["csharp", "java", "python", "php", "nodejs"];
   These details can then be used when defining the index-fields.
   Once the index is deployed, you can query the index to find Employee documents based on these attachment properties.
 
-* To index **attachments' content**, see the examples [below](../../document-extensions/attachments/indexing.mdx#index-details-&-content---by-attachment-name).
+* To index **attachments' content**, see the examples [below](../../document-extensions/attachments/indexing.mdx#index-details--content---by-attachment-name).
 
 <Tabs groupId='languageSyntax'>
 <TabItem value="LINQ_index" label="LINQ_index">
@@ -1339,8 +1339,8 @@ $employees = $session
 
 * In this page:  
   * [Index attachments details](../../document-extensions/attachments/indexing.mdx#index-attachments-details)
-  * [Index details & content - by attachment name](../../document-extensions/attachments/indexing.mdx#index-details-&-content---by-attachment-name)
-  * [Index details & content - all attachments](../../document-extensions/attachments/indexing.mdx#index-details-&-content---all-attachments)
+  * [Index details & content - by attachment name](../../document-extensions/attachments/indexing.mdx#index-details--content---by-attachment-name)
+  * [Index details & content - all attachments](../../document-extensions/attachments/indexing.mdx#index-details--content---all-attachments)
   * [Leveraging indexed attachments](../../document-extensions/attachments/indexing.mdx#leveraging-indexed-attachments)
   * [Syntax](../../document-extensions/attachments/indexing.mdx#syntax)
 
@@ -1356,7 +1356,7 @@ $employees = $session
   These details can then be used when defining the index-fields.
   Once the index is deployed, you can query the index to find Employee documents based on these attachment properties.
 
-* To index **attachments' content**, see the examples [below](../../document-extensions/attachments/indexing.mdx#index-details-&-content---by-attachment-name).
+* To index **attachments' content**, see the examples [below](../../document-extensions/attachments/indexing.mdx#index-details--content---by-attachment-name).
 
 <TabItem value="index_1" label="index_1">
 <CodeBlock language="js">
diff --git a/versioned_docs/version-6.2/indexes/multi-map-indexes.mdx b/versioned_docs/version-6.2/indexes/multi-map-indexes.mdx
index 32e13c5096..c8aff3d301 100644
--- a/versioned_docs/version-6.2/indexes/multi-map-indexes.mdx
+++ b/versioned_docs/version-6.2/indexes/multi-map-indexes.mdx
@@ -28,7 +28,7 @@ export const supportedLanguages = ["csharp", "java", "python", "php", "nodejs"];
   Learn how to [create Multi-Map-Reduce indexes](../indexes/map-reduce-indexes.mdx#creating-multi-map-reduce-indexes)  
 
 * In this page:
-  * [AddMap & AddMapForAll](../indexes/multi-map-indexes.mdx#addmap-&-addmapforall)
+  * [AddMap & AddMapForAll](../indexes/multi-map-indexes.mdx#addmap--addmapforall)
   * [Searching across multiple collections](../indexes/multi-map-indexes.mdx#searching-across-multiple-collections)
   * [Remarks](../indexes/multi-map-indexes.mdx#remarks)
 
diff --git a/versioned_docs/version-6.2/indexes/using-dynamic-fields.mdx b/versioned_docs/version-6.2/indexes/using-dynamic-fields.mdx
index 6c5cca18ba..8f8e49760c 100644
--- a/versioned_docs/version-6.2/indexes/using-dynamic-fields.mdx
+++ b/versioned_docs/version-6.2/indexes/using-dynamic-fields.mdx
@@ -42,7 +42,7 @@ export const supportedLanguages = ["csharp", "java", "python", "php", "nodejs"];
         * [Example - basic](../indexes/using-dynamic-fields.mdx#example---basic)
         * [Example - list](../indexes/using-dynamic-fields.mdx#example---list)
     * [CreateField syntax](../indexes/using-dynamic-fields.mdx#createfield-syntax)
-    * [Indexed fields & terms view](../indexes/using-dynamic-fields.mdx#indexed-fields-&-terms-view)
+    * [Indexed fields & terms view](../indexes/using-dynamic-fields.mdx#indexed-fields--terms-view)
 
 </Admonition>
 
@@ -604,7 +604,7 @@ Below are sample index fields & their terms generated from the last example.
         * [Example - basic](../indexes/using-dynamic-fields.mdx#example---basic)
         * [Example - list](../indexes/using-dynamic-fields.mdx#example---list)
     * [CreateField syntax](../indexes/using-dynamic-fields.mdx#createfield-syntax)
-    * [Indexed fields & terms view](../indexes/using-dynamic-fields.mdx#indexed-fields-&-terms-view)
+    * [Indexed fields & terms view](../indexes/using-dynamic-fields.mdx#indexed-fields--terms-view)
 
 </Admonition>
 
@@ -1090,7 +1090,7 @@ Below are sample index fields & their terms generated from the last example.
         * [Example - basic](../indexes/using-dynamic-fields.mdx#example---basic)
         * [Example - list](../indexes/using-dynamic-fields.mdx#example---list)
     * [CreateField syntax](../indexes/using-dynamic-fields.mdx#createfield-syntax)
-    * [Indexed fields & terms view](../indexes/using-dynamic-fields.mdx#indexed-fields-&-terms-view)
+    * [Indexed fields & terms view](../indexes/using-dynamic-fields.mdx#indexed-fields--terms-view)
 
 </Admonition>
 
@@ -1608,7 +1608,7 @@ Below are sample index fields & their terms generated from the last example.
         * [Example - basic](../indexes/using-dynamic-fields.mdx#example---basic)
         * [Example - list](../indexes/using-dynamic-fields.mdx#example---list)
     * [CreateField syntax](../indexes/using-dynamic-fields.mdx#createfield-syntax)
-    * [Indexed fields & terms view](../indexes/using-dynamic-fields.mdx#indexed-fields-&-terms-view)
+    * [Indexed fields & terms view](../indexes/using-dynamic-fields.mdx#indexed-fields--terms-view)
 
 </Admonition>
 
@@ -2174,7 +2174,7 @@ Below are sample index fields & their terms generated from the last example.
         * [Example - basic](../indexes/using-dynamic-fields.mdx#example---basic)
         * [Example - list](../indexes/using-dynamic-fields.mdx#example---list)
     * [CreateField syntax](../indexes/using-dynamic-fields.mdx#createfield-syntax)
-    * [Indexed fields & terms view](../indexes/using-dynamic-fields.mdx#indexed-fields-&-terms-view)
+    * [Indexed fields & terms view](../indexes/using-dynamic-fields.mdx#indexed-fields--terms-view)
 
 </Admonition>
 
diff --git a/versioned_docs/version-6.2/migration/client-api/client-breaking-changes.mdx b/versioned_docs/version-6.2/migration/client-api/client-breaking-changes.mdx
index a581e73812..1fb080b18a 100644
--- a/versioned_docs/version-6.2/migration/client-api/client-breaking-changes.mdx
+++ b/versioned_docs/version-6.2/migration/client-api/client-breaking-changes.mdx
@@ -21,7 +21,7 @@ with their behavior in previous versions.
 * In this page:
    * [`CounterBatchOperation` default increment Delta is 1](../../migration/client-api/client-breaking-changes.mdx#counterbatchoperation-default-increment-delta-is-1)  
    * [CmpXchg item can only be created with an index of 0](../../migration/client-api/client-breaking-changes.mdx#cmpxchg-item-can-only-be-created-with-an-index-of-0)  
-   * [Dynamic Linq query cannot apply `.Any` with logical AND (`&&`)](../../migration/client-api/client-breaking-changes.mdx#dynamic-linq-query-cannot-apply-any-with-logical-and-(&&))  
+   * [Dynamic Linq query cannot apply `.Any` with logical AND (`&&`)](../../migration/client-api/client-breaking-changes.mdx#dynamic-linq-query-cannot-apply-any-with-logical-and-())  
    * [`LoadDocument` must be provided with a collection name string](../../migration/client-api/client-breaking-changes.mdx#loaddocument-must-be-provided-with-a-collection-name-string)  
    * [Tracking operations using the Changes API now requires Node Tag](../../migration/client-api/client-breaking-changes.mdx#tracking-operations-using-the-changes-api-now-requires-node-tag)  
    * [Consistency in `null` handling](../../migration/client-api/client-breaking-changes.mdx#consistency-in-null-handling)  
diff --git a/versioned_docs/version-6.2/server/clustering/distribution/cluster-observer.mdx b/versioned_docs/version-6.2/server/clustering/distribution/cluster-observer.mdx
index 26b0c8cdc6..f9135f66a7 100644
--- a/versioned_docs/version-6.2/server/clustering/distribution/cluster-observer.mdx
+++ b/versioned_docs/version-6.2/server/clustering/distribution/cluster-observer.mdx
@@ -75,7 +75,7 @@ You can interact with the `Cluster Observer` using the following REST API calls:
 
 | URL                                 | Method  | Query Params   | Description                                                                                                                                                          |
 |-------------------------------------|---------|----------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `/admin/cluster/observer/suspend`   | POST    | value=[`bool`] | Setting `false` will suspend the _Cluster Observer_ operation for the current [Leader term](../../../studio/cluster/cluster-view.mdx#cluster-nodes-states-&-types-flow). |
+| `/admin/cluster/observer/suspend`   | POST    | value=[`bool`] | Setting `false` will suspend the _Cluster Observer_ operation for the current [Leader term](../../../studio/cluster/cluster-view.mdx#cluster-nodes-states--types-flow). |
 | `/admin/cluster/observer/decisions` | GET     |                | Fetch the log of the recent decisions made by the cluster observer.                                                                                                  |
 | `/admin/cluster/maintenance-stats`  | GET     |                | Fetch the latest reports of the _Cluster Observer_                                                                                                                   |
 
diff --git a/versioned_docs/version-6.2/server/clustering/distribution/distributed-database.mdx b/versioned_docs/version-6.2/server/clustering/distribution/distributed-database.mdx
index 932216a41e..cc736f52ee 100644
--- a/versioned_docs/version-6.2/server/clustering/distribution/distributed-database.mdx
+++ b/versioned_docs/version-6.2/server/clustering/distribution/distributed-database.mdx
@@ -75,7 +75,7 @@ Each **Database Node** can be in one of the following states:
   The new node will be in a `Promotable` state until it receives _and_ indexes all the documents from the mentor node.  
 * Learn more in:  
   * [Cluster node types](../../../studio/cluster/cluster-view.mdx#cluster-nodes-types)
-  * [Cluster node states and types flow](../../../studio/cluster/cluster-view.mdx#cluster-nodes-states-&-types-flow)
+  * [Cluster node states and types flow](../../../studio/cluster/cluster-view.mdx#cluster-nodes-states--types-flow)
 
 </Admonition>
 
diff --git a/versioned_docs/version-6.2/server/clustering/replication/replication-overview.mdx b/versioned_docs/version-6.2/server/clustering/replication/replication-overview.mdx
index 72ca81e70e..3f08dc1d67 100644
--- a/versioned_docs/version-6.2/server/clustering/replication/replication-overview.mdx
+++ b/versioned_docs/version-6.2/server/clustering/replication/replication-overview.mdx
@@ -32,7 +32,7 @@ import LanguageContent from "@site/src/components/LanguageContent";
       * [Hub/Sink replication](../../../server/clustering/replication/replication-overview.mdx#hubsink-replication)
     * [What is replicated](../../../server/clustering/replication/replication-overview.mdx#what-is-replicated)  
     * [How replication works](../../../server/clustering/replication/replication-overview.mdx#how-replication-works)  
-    * [Replication & transaction boundary](../../../server/clustering/replication/replication-overview.mdx#replication-&-transaction-boundary)  
+    * [Replication & transaction boundary](../../../server/clustering/replication/replication-overview.mdx#replication--transaction-boundary)  
 
 </Admonition>
 ## Replication types
diff --git a/versioned_docs/version-6.2/sharding/migration.mdx b/versioned_docs/version-6.2/sharding/migration.mdx
index 1b7d213fb7..1246d9bf9c 100644
--- a/versioned_docs/version-6.2/sharding/migration.mdx
+++ b/versioned_docs/version-6.2/sharding/migration.mdx
@@ -32,7 +32,7 @@ database to the new one in several ways.
   of the replica.  
 
 * In this page:  
-  * [Export & Import](../sharding/migration.mdx#export-&-import)  
+  * [Export & Import](../sharding/migration.mdx#export--import)  
   * [Backup](../sharding/migration.mdx#backup)  
   * [External Replication](../sharding/migration.mdx#external-replication)  
 
diff --git a/versioned_docs/version-6.2/sharding/subscriptions.mdx b/versioned_docs/version-6.2/sharding/subscriptions.mdx
index 3149e6480a..a56b035a6b 100644
--- a/versioned_docs/version-6.2/sharding/subscriptions.mdx
+++ b/versioned_docs/version-6.2/sharding/subscriptions.mdx
@@ -95,7 +95,7 @@ Data subscriptions features that are not supported yet under a sharded database:
   Allowing multiple workers to connect a common subscription simultaneously.  
 * [Data Subscriptions Revisions Support](../client-api/data-subscriptions/advanced-topics/subscription-with-revisioning.mdx)  
   Subscribing to document revisions.  
-* [SubscriptionCreationOptions.ChangeVector](../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptions&lt;t&gt;)  
+* [SubscriptionCreationOptions.ChangeVector](../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptionst)  
   Providing an arbitrary change vector from which the subscription would start processing 
   is currently not supported.  
   <Admonition type="note" title="">
diff --git a/versioned_docs/version-6.2/start/installation/setup-wizard.mdx b/versioned_docs/version-6.2/start/installation/setup-wizard.mdx
index ebb0528394..3b0787ba5c 100644
--- a/versioned_docs/version-6.2/start/installation/setup-wizard.mdx
+++ b/versioned_docs/version-6.2/start/installation/setup-wizard.mdx
@@ -661,7 +661,7 @@ In the **Unsecure Mode**, all you need to do is specify the **IP address** and *
                    This new cluster will only contain this node.  
    * **Unchecked** - The server will Not be created in a cluster.  
                      The server will be created in a 
-                     [Passive State](../../studio/cluster/cluster-view.mdx#cluster-nodes-states-&-types-flow) 
+                     [Passive State](../../studio/cluster/cluster-view.mdx#cluster-nodes-states--types-flow) 
                      and can later be added to an already existing cluster.  
 
 4. **Environment**  
diff --git a/versioned_docs/version-6.2/start/licensing/renew-license.mdx b/versioned_docs/version-6.2/start/licensing/renew-license.mdx
index 4de1e81a5e..e237e84d40 100644
--- a/versioned_docs/version-6.2/start/licensing/renew-license.mdx
+++ b/versioned_docs/version-6.2/start/licensing/renew-license.mdx
@@ -24,7 +24,7 @@ import LanguageContent from "@site/src/components/LanguageContent";
 
 * In this page:
     * [Renew commercial licenses](../../start/licensing/renew-license.mdx#renew-commercial-licenses)
-    * [Renew Developer & Community licenses](../../start/licensing/renew-license.mdx#renew-developer-&-community-licenses)
+    * [Renew Developer & Community licenses](../../start/licensing/renew-license.mdx#renew-developer--community-licenses)
 
 </Admonition>
 ## Renew commercial licenses
diff --git a/versioned_docs/version-6.2/studio/cluster/cluster-view.mdx b/versioned_docs/version-6.2/studio/cluster/cluster-view.mdx
index 51f7e5e122..2d539e56b5 100644
--- a/versioned_docs/version-6.2/studio/cluster/cluster-view.mdx
+++ b/versioned_docs/version-6.2/studio/cluster/cluster-view.mdx
@@ -34,7 +34,7 @@ import LanguageContent from "@site/src/components/LanguageContent";
   * [Cluster View Operations](../../studio/cluster/cluster-view.mdx#cluster-view-operations)  
   * [Reassign Cores](../../studio/cluster/cluster-view.mdx#reassign-cores)  
   * [Cluster Nodes Types](../../studio/cluster/cluster-view.mdx#cluster-nodes-types)  
-  * [Cluster Nodes States & Types Flow](../../studio/cluster/cluster-view.mdx#cluster-nodes-states-&-types-flow)  
+  * [Cluster Nodes States & Types Flow](../../studio/cluster/cluster-view.mdx#cluster-nodes-states--types-flow)  
   * [Cluster-Wide operation -vs- Database Operations](../../studio/cluster/cluster-view.mdx#cluster-wide-operation--vs--database-operations)  
 </Admonition>
 ## Cluster View Stats
diff --git a/versioned_docs/version-6.2/studio/database/indexes/create-map-index.mdx b/versioned_docs/version-6.2/studio/database/indexes/create-map-index.mdx
index f47ef2385a..db556daae3 100644
--- a/versioned_docs/version-6.2/studio/database/indexes/create-map-index.mdx
+++ b/versioned_docs/version-6.2/studio/database/indexes/create-map-index.mdx
@@ -21,7 +21,7 @@ import LanguageContent from "@site/src/components/LanguageContent";
 * In this page:  
   * [Edit Index View](../../../studio/database/indexes/create-map-index.mdx#edit-index-view)  
   * [Test Index](../../../studio/database/indexes/create-map-index.mdx#test-index)  
-  * [Index Fields & Terms](../../../studio/database/indexes/create-map-index.mdx#index-fields-&-terms)  
+  * [Index Fields & Terms](../../../studio/database/indexes/create-map-index.mdx#index-fields--terms)  
   * [Index Field Options](../../../studio/database/indexes/create-map-index.mdx#index-field-options)  
      * [Add Compound Field](../../../studio/database/indexes/create-map-index.mdx#add-compound-field)  
   * [Configuration](../../../studio/database/indexes/create-map-index.mdx#configuration)  
@@ -41,7 +41,7 @@ import LanguageContent from "@site/src/components/LanguageContent";
 2. Options available for an already saved index:  
    **Copy C#** - Click to view and copy the C# class that defines the index as set in the Studio.  
    **Query** - Click to go the the Query View and query this index.  
-   **Terms** - Click to see the index terms, see [below](../../../studio/database/indexes/create-map-index.mdx#index-fields-&-terms).  
+   **Terms** - Click to see the index terms, see [below](../../../studio/database/indexes/create-map-index.mdx#index-fields--terms).  
    **Advanced** - Click to dump the raw index or optimize it.  
    **Delete** - Delete this index.  
 
diff --git a/versioned_docs/version-7.0/client-api/commands/documents/delete.mdx b/versioned_docs/version-7.0/client-api/commands/documents/delete.mdx
index 60b97e52ea..430737f570 100644
--- a/versioned_docs/version-7.0/client-api/commands/documents/delete.mdx
+++ b/versioned_docs/version-7.0/client-api/commands/documents/delete.mdx
@@ -159,7 +159,7 @@ catch (Exception e)
 | Parameter        | Type     | Description                                                                                                                                                                                                                                             |
 |------------------|----------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | **id**           | `string` | The ID of the document to delete.                                                                                                                                                                                                                       |
-| **changeVector** | `string` | The change-vector of the document you wish to delete,<br/>used for [optimistic concurrency control](../../../server/clustering/replication/change-vector.mdx#concurrency-control-&-change-vectors).<br/>Pass `null` to skip the check and force the deletion. |
+| **changeVector** | `string` | The change-vector of the document you wish to delete,<br/>used for [optimistic concurrency control](../../../server/clustering/replication/change-vector.mdx#concurrency-control--change-vectors).<br/>Pass `null` to skip the check and force the deletion. |
 
 
 
@@ -376,7 +376,7 @@ catch (err) \{
 | Parameter        | Type     | Description                                                                                                                                                                                                                                             |
 |------------------|----------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | **id**           | `string` | The ID of the document to delete.                                                                                                                                                                                                                       |
-| **changeVector** | `string` | The change-vector of the document you wish to delete,<br/>used for [optimistic concurrency control](../../../server/clustering/replication/change-vector.mdx#concurrency-control-&-change-vectors).<br/>Pass `null` to skip the check and force the deletion. |
+| **changeVector** | `string` | The change-vector of the document you wish to delete,<br/>used for [optimistic concurrency control](../../../server/clustering/replication/change-vector.mdx#concurrency-control--change-vectors).<br/>Pass `null` to skip the check and force the deletion. |
 
 
 
diff --git a/versioned_docs/version-7.0/client-api/commands/documents/put.mdx b/versioned_docs/version-7.0/client-api/commands/documents/put.mdx
index bbb24eb9f5..0ed48b248c 100644
--- a/versioned_docs/version-7.0/client-api/commands/documents/put.mdx
+++ b/versioned_docs/version-7.0/client-api/commands/documents/put.mdx
@@ -193,7 +193,7 @@ var theDocumentCV = putResult.ChangeVector;
 | Parameter        | Type                        | Description                                                                                                                                                                                                                                          |
 |------------------|-----------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | **id**           | `string`                    | Unique ID under which document will be stored.                                                                                                                                                                                                       |
-| **changeVector** | `string`                    | The change-vector of the document you wish to update,<br/>used for [optimistic concurrency control](../../../server/clustering/replication/change-vector.mdx#concurrency-control-&-change-vectors).<br/>Pass `null` to skip the check and force the 'put'. |
+| **changeVector** | `string`                    | The change-vector of the document you wish to update,<br/>used for [optimistic concurrency control](../../../server/clustering/replication/change-vector.mdx#concurrency-control--change-vectors).<br/>Pass `null` to skip the check and force the 'put'. |
 | **document**     | `BlittableJsonReaderObject` | The document to store. Use:<br/>`session.Advanced.JsonConverter.ToBlittable(doc, docInfo);` to convert your entity to a `BlittableJsonReaderObject`.                                                                                                  |
 
 <TabItem value="syntax_2" label="syntax_2">
@@ -478,7 +478,7 @@ assert.strictEqual(theDocumentID, "categories/999");
 | Parameter        | Type     | Description                                                                                                                                                                                                                                          |
 |------------------|----------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | **id**           | `string` | Unique ID under which document will be stored.                                                                                                                                                                                                       |
-| **changeVector** | `string` | The change-vector of the document you wish to update,<br/>used for [optimistic concurrency control](../../../server/clustering/replication/change-vector.mdx#concurrency-control-&-change-vectors).<br/>Pass `null` to skip the check and force the 'put'. |
+| **changeVector** | `string` | The change-vector of the document you wish to update,<br/>used for [optimistic concurrency control](../../../server/clustering/replication/change-vector.mdx#concurrency-control--change-vectors).<br/>Pass `null` to skip the check and force the 'put'. |
 | **document**     | `object` | The document to store.                                                                                                                                                                                                                               |
 
 <TabItem value="syntax_2" label="syntax_2">
diff --git a/versioned_docs/version-7.0/client-api/data-subscriptions/consumption/api-overview.mdx b/versioned_docs/version-7.0/client-api/data-subscriptions/consumption/api-overview.mdx
index 697cbb83d1..963d017485 100644
--- a/versioned_docs/version-7.0/client-api/data-subscriptions/consumption/api-overview.mdx
+++ b/versioned_docs/version-7.0/client-api/data-subscriptions/consumption/api-overview.mdx
@@ -25,9 +25,9 @@ export const supportedLanguages = ["csharp", "java", "python", "nodejs"];
    * [Create the subscription worker](../../../client-api/data-subscriptions/consumption/api-overview.mdx#create-the-subscription-worker)  
    * [SubscriptionWorkerOptions](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworkeroptions)  
    * [Run the subscription worker](../../../client-api/data-subscriptions/consumption/api-overview.mdx#run-the-subscription-worker)  
-   * [SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatch&lt;t&gt;)  
-   * [SubscriptionBatch&lt;T&gt;.Item](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatch&lt;t&gt;item)  
-   * [SubscriptionWorker&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworker&lt;t&gt;)  
+   * [SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatcht)  
+   * [SubscriptionBatch&lt;T&gt;.Item](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatchtitem)  
+   * [SubscriptionWorker&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworkert)  
 
 </Admonition>
 ## Create the subscription worker
@@ -129,7 +129,7 @@ Learn more about `SubscriptionOpeningStrategy` in [worker strategies](../../../c
 ## Run the subscription worker
 
 After [creating](../../../client-api/data-subscriptions/consumption/api-overview.mdx#create-the-subscription-worker) a subscription worker, the subscription worker is still not processing any documents.  
-To start processing, you need to call the `Run` method of the [SubscriptionWorker](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworker&lt;t&gt;).  
+To start processing, you need to call the `Run` method of the [SubscriptionWorker](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworkert).  
 
 The `Run` function takes a delegate, which is your client-side code responsible for processing the received document batches.
 
@@ -160,7 +160,7 @@ Task Run(Func<SubscriptionBatch<T>, Task> processDocuments,
 
 | Member                   | Type                              | Description                                                                                                                                                            |
 |--------------------------|-----------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| **Items**                | `List<SubscriptionBatch<T>.Item>` | List of items in the batch.<br/>See [SubscriptionBatch&lt;T&gt;.Item](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatch&lt;t&gt;item) below. |
+| **Items**                | `List<SubscriptionBatch<T>.Item>` | List of items in the batch.<br/>See [SubscriptionBatch&lt;T&gt;.Item](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatchtitem) below. |
 | **NumberOfItemsInBatch** | `int`                             | Number of items in the batch.                                                                                                                                          |
 
 | Method Signature       | Return value            | Description                                                                                                       |
@@ -285,8 +285,8 @@ Using it outside this scope may cause unexpected behavior.
    * [Create the subscription worker](../../../client-api/data-subscriptions/consumption/api-overview.mdx#create-the-subscription-worker)
    * [SubscriptionWorkerOptions](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworkeroptions)  
    * [Run the subscription worker](../../../client-api/data-subscriptions/consumption/api-overview.mdx#run-the-subscription-worker)  
-   * [SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatch&lt;t&gt;)  
-   * [SubscriptionWorker&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworker&lt;t&gt;)  
+   * [SubscriptionBatch&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionbatcht)  
+   * [SubscriptionWorker&lt;T&gt;](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworkert)  
 
 </Admonition>
 ## Create the subscription worker
@@ -350,7 +350,7 @@ All other parameters are optional and will default to their respective default v
 ## Run the subscription worker
 
 After [creating](../../../client-api/data-subscriptions/consumption/api-overview.mdx#create-the-subscription-worker) a subscription worker, the subscription worker is still not processing any documents.  
-To start processing, you need to call the `run` method of the [SubscriptionWorker](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworker&lt;t&gt;).
+To start processing, you need to call the `run` method of the [SubscriptionWorker](../../../client-api/data-subscriptions/consumption/api-overview.mdx#subscriptionworkert).
 
 The `run` function takes a delegate, which is your client-side code responsible for processing the received document batches.
 
diff --git a/versioned_docs/version-7.0/client-api/data-subscriptions/creation/examples.mdx b/versioned_docs/version-7.0/client-api/data-subscriptions/creation/examples.mdx
index 1914e600aa..d30f03a020 100644
--- a/versioned_docs/version-7.0/client-api/data-subscriptions/creation/examples.mdx
+++ b/versioned_docs/version-7.0/client-api/data-subscriptions/creation/examples.mdx
@@ -278,7 +278,7 @@ See how to consume this type of subscription [here](../../../client-api/data-sub
 **Include using builder**:
 
 Include statements can be added to the subscription with `ISubscriptionIncludeBuilder`.  
-This builder is assigned to the  `Includes` property in [SubscriptionCreationOptions&lt;T&gt;](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptions&lt;t&gt;).  
+This builder is assigned to the  `Includes` property in [SubscriptionCreationOptions&lt;T&gt;](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptionst).  
 It supports methods for including documents as well as [counters](../../../client-api/data-subscriptions/creation/examples.mdx#create-subscription---include-counters). 
 These methods can be chained.
 
@@ -700,7 +700,7 @@ See how to consume this type of subscription [here](../../../client-api/data-sub
 **Include using builder**:
 
 Include statements can be added to the subscription with `SubscriptionIncludeBuilder`.  
-This builder is assigned to the  `includes` property in [SubscriptionCreationOptions](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptions&lt;t&gt;).  
+This builder is assigned to the  `includes` property in [SubscriptionCreationOptions](../../../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptionst).  
 It supports methods for including documents as well as [counters](../../../client-api/data-subscriptions/creation/examples.mdx#create-subscription---include-counters).
 These methods can be chained.  
 
diff --git a/versioned_docs/version-7.0/client-api/faq/transaction-support.mdx b/versioned_docs/version-7.0/client-api/faq/transaction-support.mdx
index cf50fc670d..feb3ea203b 100644
--- a/versioned_docs/version-7.0/client-api/faq/transaction-support.mdx
+++ b/versioned_docs/version-7.0/client-api/faq/transaction-support.mdx
@@ -174,7 +174,7 @@ If you care about avoiding lost updates, you need to ensure you have the conflic
 
 The following is an important aspect to RavenDB's transactional behavior with regards to asynchronous replication.  
 
-When replicating modifications to another server, RavenDB will ensure that the [transaction boundaries](../../server/clustering/replication/replication-overview.mdx#replication-&-transaction-boundary) are maintained.  
+When replicating modifications to another server, RavenDB will ensure that the [transaction boundaries](../../server/clustering/replication/replication-overview.mdx#replication--transaction-boundary) are maintained.  
 If there are several document modifications in the same transaction they will be sent in the same replication batch, keeping the transaction boundary on the destination as well.  
 
 However, a special attention is needed when a document is modified in two separate transactions but the replication of the first transaction has not occurred yet. 
diff --git a/versioned_docs/version-7.0/client-api/session/updating-entities.mdx b/versioned_docs/version-7.0/client-api/session/updating-entities.mdx
index f4a0148763..8e5d3dc888 100644
--- a/versioned_docs/version-7.0/client-api/session/updating-entities.mdx
+++ b/versioned_docs/version-7.0/client-api/session/updating-entities.mdx
@@ -35,8 +35,8 @@ export const supportedLanguages = ["csharp", "python", "php", "nodejs"];
 
 
 * In this page:
-    * [Load a document & update](../../client-api/session/updating-entities.mdx#load-a-document-&-update)
-    * [Query for documents & update](../../client-api/session/updating-entities.mdx#query-for-documents-&-update)
+    * [Load a document & update](../../client-api/session/updating-entities.mdx#load-a-document--update)
+    * [Query for documents & update](../../client-api/session/updating-entities.mdx#query-for-documents--update)
     
 </Admonition>
 ## Load a document & update
@@ -158,8 +158,8 @@ export const supportedLanguages = ["csharp", "python", "php", "nodejs"];
 
 
 * In this page:
-    * [Load a document & update](../../client-api/session/updating-entities.mdx#load-a-document-&-update)
-    * [Query for documents & update](../../client-api/session/updating-entities.mdx#query-for-documents-&-update)
+    * [Load a document & update](../../client-api/session/updating-entities.mdx#load-a-document--update)
+    * [Query for documents & update](../../client-api/session/updating-entities.mdx#query-for-documents--update)
     
 </Admonition>
 ## Load a document & update
@@ -236,8 +236,8 @@ export const supportedLanguages = ["csharp", "python", "php", "nodejs"];
 
 
 * In this page:
-    * [Load a document & update](../../client-api/session/updating-entities.mdx#load-a-document-&-update)
-    * [Query for documents & update](../../client-api/session/updating-entities.mdx#query-for-documents-&-update)
+    * [Load a document & update](../../client-api/session/updating-entities.mdx#load-a-document--update)
+    * [Query for documents & update](../../client-api/session/updating-entities.mdx#query-for-documents--update)
     
 </Admonition>
 ## Load a document & update
@@ -323,8 +323,8 @@ try \{
 
 
 * In this page:
-    * [Load a document & update](../../client-api/session/updating-entities.mdx#load-a-document-&-update)
-    * [Query for documents & update](../../client-api/session/updating-entities.mdx#query-for-documents-&-update)
+    * [Load a document & update](../../client-api/session/updating-entities.mdx#load-a-document--update)
+    * [Query for documents & update](../../client-api/session/updating-entities.mdx#query-for-documents--update)
 
 </Admonition>
 ## Load a document & update
diff --git a/versioned_docs/version-7.0/client-api/session/what-is-a-session-and-how-does-it-work.mdx b/versioned_docs/version-7.0/client-api/session/what-is-a-session-and-how-does-it-work.mdx
index 857a8135bf..1dba0285f5 100644
--- a/versioned_docs/version-7.0/client-api/session/what-is-a-session-and-how-does-it-work.mdx
+++ b/versioned_docs/version-7.0/client-api/session/what-is-a-session-and-how-does-it-work.mdx
@@ -31,7 +31,7 @@ export const supportedLanguages = ["csharp", "java", "python", "php", "nodejs"];
       * [Create document example](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#create-document-example)
       * [Modify document example](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#modify-document-example)
   * [Identity map pattern](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#identity-map-pattern)
-  * [Batching & Transactions](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#batching-&-transactions)
+  * [Batching & Transactions](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#batching--transactions)
   * [Concurrency control](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#concurrency-control)
   * [Reducing server calls (best practices) for:](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#reducing-server-calls-(best-practices)-for:)  
       * [The N+1 problem](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#the-select-n1-problem)    
@@ -380,7 +380,7 @@ To address this, the session API offers the concurrency control feature.
         * [Create document example](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#create-document-example)
         * [Modify document example](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#modify-document-example)
     * [Identity map pattern](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#identity-map-pattern)
-    * [Batching & Transactions](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#batching-&-transactions)
+    * [Batching & Transactions](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#batching--transactions)
     * [Concurrency control](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#concurrency-control)
     * [Reducing server calls (best practices) for:](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#reducing-server-calls-(best-practices)-for:)
         * [The N+1 problem](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#the-select-n1-problem)
@@ -669,7 +669,7 @@ To address this, the session API offers the concurrency control feature.
       * [Create document example](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#create-document-example)
       * [Modify document example](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#modify-document-example)
   * [Identity map pattern](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#identity-map-pattern)
-  * [Batching & Transactions](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#batching-&-transactions)
+  * [Batching & Transactions](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#batching--transactions)
   * [Concurrency control](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#concurrency-control)
   * [Reducing server calls (best practices) for:](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#reducing-server-calls-(best-practices)-for:)  
       * [The N+1 problem](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#the-select-n1-problem)    
@@ -953,7 +953,7 @@ To address this, the session API offers the concurrency control feature.
       * [Create document example](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#create-document-example)
       * [Modify document example](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#modify-document-example)
   * [Identity map pattern](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#identity-map-pattern)
-  * [Batching & Transactions](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#batching-&-transactions)
+  * [Batching & Transactions](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#batching--transactions)
   * [Concurrency control](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#concurrency-control)
   * [Reducing server calls (best practices) for:](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#reducing-server-calls-(best-practices)-for:)  
       * [The N+1 problem](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#the-select-n1-problem)    
@@ -1247,7 +1247,7 @@ To address this, the session API offers the concurrency control feature.
         * [Create document example](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#create-document-example)
         * [Modify document example](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#modify-document-example)
     * [Identity map pattern](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#identity-map-pattern)
-    * [Batching & Transactions](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#batching-&-transactions)
+    * [Batching & Transactions](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#batching--transactions)
     * [Concurrency control](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#concurrency-control)
     * [Reducing server calls (best practices) for:](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#reducing-server-calls-(best-practices)-for:)
         * [The N+1 problem](../../client-api/session/what-is-a-session-and-how-does-it-work.mdx#the-select-n1-problem)
diff --git a/versioned_docs/version-7.0/document-extensions/attachments/indexing.mdx b/versioned_docs/version-7.0/document-extensions/attachments/indexing.mdx
index 5c2aae2243..487b656c9c 100644
--- a/versioned_docs/version-7.0/document-extensions/attachments/indexing.mdx
+++ b/versioned_docs/version-7.0/document-extensions/attachments/indexing.mdx
@@ -31,8 +31,8 @@ export const supportedLanguages = ["csharp", "java", "python", "php", "nodejs"];
 
 * In this page:
     * [Index attachments details](../../document-extensions/attachments/indexing.mdx#index-attachments-details)
-    * [Index details & content - by attachment name](../../document-extensions/attachments/indexing.mdx#index-details-&-content---by-attachment-name)
-    * [Index details & content - all attachments](../../document-extensions/attachments/indexing.mdx#index-details-&-content---all-attachments)
+    * [Index details & content - by attachment name](../../document-extensions/attachments/indexing.mdx#index-details--content---by-attachment-name)
+    * [Index details & content - all attachments](../../document-extensions/attachments/indexing.mdx#index-details--content---all-attachments)
     * [Leveraging indexed attachments](../../document-extensions/attachments/indexing.mdx#leveraging-indexed-attachments)
     * [Syntax](../../document-extensions/attachments/indexing.mdx#syntax)
 
@@ -47,7 +47,7 @@ export const supportedLanguages = ["csharp", "java", "python", "php", "nodejs"];
   These details can then be used when defining the index-fields.
   Once the index is deployed, you can query the index to find Employee documents based on these attachment properties.
 
-* To index **attachments' content**, see the examples [below](../../document-extensions/attachments/indexing.mdx#index-details-&-content---by-attachment-name).
+* To index **attachments' content**, see the examples [below](../../document-extensions/attachments/indexing.mdx#index-details--content---by-attachment-name).
 
 <Tabs groupId='languageSyntax'>
 <TabItem value="LINQ_index" label="LINQ_index">
@@ -1339,8 +1339,8 @@ $employees = $session
 
 * In this page:  
   * [Index attachments details](../../document-extensions/attachments/indexing.mdx#index-attachments-details)
-  * [Index details & content - by attachment name](../../document-extensions/attachments/indexing.mdx#index-details-&-content---by-attachment-name)
-  * [Index details & content - all attachments](../../document-extensions/attachments/indexing.mdx#index-details-&-content---all-attachments)
+  * [Index details & content - by attachment name](../../document-extensions/attachments/indexing.mdx#index-details--content---by-attachment-name)
+  * [Index details & content - all attachments](../../document-extensions/attachments/indexing.mdx#index-details--content---all-attachments)
   * [Leveraging indexed attachments](../../document-extensions/attachments/indexing.mdx#leveraging-indexed-attachments)
   * [Syntax](../../document-extensions/attachments/indexing.mdx#syntax)
 
@@ -1356,7 +1356,7 @@ $employees = $session
   These details can then be used when defining the index-fields.
   Once the index is deployed, you can query the index to find Employee documents based on these attachment properties.
 
-* To index **attachments' content**, see the examples [below](../../document-extensions/attachments/indexing.mdx#index-details-&-content---by-attachment-name).
+* To index **attachments' content**, see the examples [below](../../document-extensions/attachments/indexing.mdx#index-details--content---by-attachment-name).
 
 <TabItem value="index_1" label="index_1">
 <CodeBlock language="js">
diff --git a/versioned_docs/version-7.0/indexes/multi-map-indexes.mdx b/versioned_docs/version-7.0/indexes/multi-map-indexes.mdx
index 32e13c5096..c8aff3d301 100644
--- a/versioned_docs/version-7.0/indexes/multi-map-indexes.mdx
+++ b/versioned_docs/version-7.0/indexes/multi-map-indexes.mdx
@@ -28,7 +28,7 @@ export const supportedLanguages = ["csharp", "java", "python", "php", "nodejs"];
   Learn how to [create Multi-Map-Reduce indexes](../indexes/map-reduce-indexes.mdx#creating-multi-map-reduce-indexes)  
 
 * In this page:
-  * [AddMap & AddMapForAll](../indexes/multi-map-indexes.mdx#addmap-&-addmapforall)
+  * [AddMap & AddMapForAll](../indexes/multi-map-indexes.mdx#addmap--addmapforall)
   * [Searching across multiple collections](../indexes/multi-map-indexes.mdx#searching-across-multiple-collections)
   * [Remarks](../indexes/multi-map-indexes.mdx#remarks)
 
diff --git a/versioned_docs/version-7.0/indexes/using-dynamic-fields.mdx b/versioned_docs/version-7.0/indexes/using-dynamic-fields.mdx
index 6c5cca18ba..8f8e49760c 100644
--- a/versioned_docs/version-7.0/indexes/using-dynamic-fields.mdx
+++ b/versioned_docs/version-7.0/indexes/using-dynamic-fields.mdx
@@ -42,7 +42,7 @@ export const supportedLanguages = ["csharp", "java", "python", "php", "nodejs"];
         * [Example - basic](../indexes/using-dynamic-fields.mdx#example---basic)
         * [Example - list](../indexes/using-dynamic-fields.mdx#example---list)
     * [CreateField syntax](../indexes/using-dynamic-fields.mdx#createfield-syntax)
-    * [Indexed fields & terms view](../indexes/using-dynamic-fields.mdx#indexed-fields-&-terms-view)
+    * [Indexed fields & terms view](../indexes/using-dynamic-fields.mdx#indexed-fields--terms-view)
 
 </Admonition>
 
@@ -604,7 +604,7 @@ Below are sample index fields & their terms generated from the last example.
         * [Example - basic](../indexes/using-dynamic-fields.mdx#example---basic)
         * [Example - list](../indexes/using-dynamic-fields.mdx#example---list)
     * [CreateField syntax](../indexes/using-dynamic-fields.mdx#createfield-syntax)
-    * [Indexed fields & terms view](../indexes/using-dynamic-fields.mdx#indexed-fields-&-terms-view)
+    * [Indexed fields & terms view](../indexes/using-dynamic-fields.mdx#indexed-fields--terms-view)
 
 </Admonition>
 
@@ -1090,7 +1090,7 @@ Below are sample index fields & their terms generated from the last example.
         * [Example - basic](../indexes/using-dynamic-fields.mdx#example---basic)
         * [Example - list](../indexes/using-dynamic-fields.mdx#example---list)
     * [CreateField syntax](../indexes/using-dynamic-fields.mdx#createfield-syntax)
-    * [Indexed fields & terms view](../indexes/using-dynamic-fields.mdx#indexed-fields-&-terms-view)
+    * [Indexed fields & terms view](../indexes/using-dynamic-fields.mdx#indexed-fields--terms-view)
 
 </Admonition>
 
@@ -1608,7 +1608,7 @@ Below are sample index fields & their terms generated from the last example.
         * [Example - basic](../indexes/using-dynamic-fields.mdx#example---basic)
         * [Example - list](../indexes/using-dynamic-fields.mdx#example---list)
     * [CreateField syntax](../indexes/using-dynamic-fields.mdx#createfield-syntax)
-    * [Indexed fields & terms view](../indexes/using-dynamic-fields.mdx#indexed-fields-&-terms-view)
+    * [Indexed fields & terms view](../indexes/using-dynamic-fields.mdx#indexed-fields--terms-view)
 
 </Admonition>
 
@@ -2174,7 +2174,7 @@ Below are sample index fields & their terms generated from the last example.
         * [Example - basic](../indexes/using-dynamic-fields.mdx#example---basic)
         * [Example - list](../indexes/using-dynamic-fields.mdx#example---list)
     * [CreateField syntax](../indexes/using-dynamic-fields.mdx#createfield-syntax)
-    * [Indexed fields & terms view](../indexes/using-dynamic-fields.mdx#indexed-fields-&-terms-view)
+    * [Indexed fields & terms view](../indexes/using-dynamic-fields.mdx#indexed-fields--terms-view)
 
 </Admonition>
 
diff --git a/versioned_docs/version-7.0/server/clustering/distribution/cluster-observer.mdx b/versioned_docs/version-7.0/server/clustering/distribution/cluster-observer.mdx
index 26b0c8cdc6..f9135f66a7 100644
--- a/versioned_docs/version-7.0/server/clustering/distribution/cluster-observer.mdx
+++ b/versioned_docs/version-7.0/server/clustering/distribution/cluster-observer.mdx
@@ -75,7 +75,7 @@ You can interact with the `Cluster Observer` using the following REST API calls:
 
 | URL                                 | Method  | Query Params   | Description                                                                                                                                                          |
 |-------------------------------------|---------|----------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `/admin/cluster/observer/suspend`   | POST    | value=[`bool`] | Setting `false` will suspend the _Cluster Observer_ operation for the current [Leader term](../../../studio/cluster/cluster-view.mdx#cluster-nodes-states-&-types-flow). |
+| `/admin/cluster/observer/suspend`   | POST    | value=[`bool`] | Setting `false` will suspend the _Cluster Observer_ operation for the current [Leader term](../../../studio/cluster/cluster-view.mdx#cluster-nodes-states--types-flow). |
 | `/admin/cluster/observer/decisions` | GET     |                | Fetch the log of the recent decisions made by the cluster observer.                                                                                                  |
 | `/admin/cluster/maintenance-stats`  | GET     |                | Fetch the latest reports of the _Cluster Observer_                                                                                                                   |
 
diff --git a/versioned_docs/version-7.0/server/clustering/distribution/distributed-database.mdx b/versioned_docs/version-7.0/server/clustering/distribution/distributed-database.mdx
index 932216a41e..cc736f52ee 100644
--- a/versioned_docs/version-7.0/server/clustering/distribution/distributed-database.mdx
+++ b/versioned_docs/version-7.0/server/clustering/distribution/distributed-database.mdx
@@ -75,7 +75,7 @@ Each **Database Node** can be in one of the following states:
   The new node will be in a `Promotable` state until it receives _and_ indexes all the documents from the mentor node.  
 * Learn more in:  
   * [Cluster node types](../../../studio/cluster/cluster-view.mdx#cluster-nodes-types)
-  * [Cluster node states and types flow](../../../studio/cluster/cluster-view.mdx#cluster-nodes-states-&-types-flow)
+  * [Cluster node states and types flow](../../../studio/cluster/cluster-view.mdx#cluster-nodes-states--types-flow)
 
 </Admonition>
 
diff --git a/versioned_docs/version-7.0/server/clustering/replication/replication-overview.mdx b/versioned_docs/version-7.0/server/clustering/replication/replication-overview.mdx
index 72ca81e70e..3f08dc1d67 100644
--- a/versioned_docs/version-7.0/server/clustering/replication/replication-overview.mdx
+++ b/versioned_docs/version-7.0/server/clustering/replication/replication-overview.mdx
@@ -32,7 +32,7 @@ import LanguageContent from "@site/src/components/LanguageContent";
       * [Hub/Sink replication](../../../server/clustering/replication/replication-overview.mdx#hubsink-replication)
     * [What is replicated](../../../server/clustering/replication/replication-overview.mdx#what-is-replicated)  
     * [How replication works](../../../server/clustering/replication/replication-overview.mdx#how-replication-works)  
-    * [Replication & transaction boundary](../../../server/clustering/replication/replication-overview.mdx#replication-&-transaction-boundary)  
+    * [Replication & transaction boundary](../../../server/clustering/replication/replication-overview.mdx#replication--transaction-boundary)  
 
 </Admonition>
 ## Replication types
diff --git a/versioned_docs/version-7.0/sharding/migration.mdx b/versioned_docs/version-7.0/sharding/migration.mdx
index 1b7d213fb7..1246d9bf9c 100644
--- a/versioned_docs/version-7.0/sharding/migration.mdx
+++ b/versioned_docs/version-7.0/sharding/migration.mdx
@@ -32,7 +32,7 @@ database to the new one in several ways.
   of the replica.  
 
 * In this page:  
-  * [Export & Import](../sharding/migration.mdx#export-&-import)  
+  * [Export & Import](../sharding/migration.mdx#export--import)  
   * [Backup](../sharding/migration.mdx#backup)  
   * [External Replication](../sharding/migration.mdx#external-replication)  
 
diff --git a/versioned_docs/version-7.0/sharding/subscriptions.mdx b/versioned_docs/version-7.0/sharding/subscriptions.mdx
index 3149e6480a..a56b035a6b 100644
--- a/versioned_docs/version-7.0/sharding/subscriptions.mdx
+++ b/versioned_docs/version-7.0/sharding/subscriptions.mdx
@@ -95,7 +95,7 @@ Data subscriptions features that are not supported yet under a sharded database:
   Allowing multiple workers to connect a common subscription simultaneously.  
 * [Data Subscriptions Revisions Support](../client-api/data-subscriptions/advanced-topics/subscription-with-revisioning.mdx)  
   Subscribing to document revisions.  
-* [SubscriptionCreationOptions.ChangeVector](../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptions&lt;t&gt;)  
+* [SubscriptionCreationOptions.ChangeVector](../client-api/data-subscriptions/creation/api-overview.mdx#subscriptioncreationoptionst)  
   Providing an arbitrary change vector from which the subscription would start processing 
   is currently not supported.  
   <Admonition type="note" title="">
diff --git a/versioned_docs/version-7.0/start/installation/setup-wizard.mdx b/versioned_docs/version-7.0/start/installation/setup-wizard.mdx
index ebb0528394..3b0787ba5c 100644
--- a/versioned_docs/version-7.0/start/installation/setup-wizard.mdx
+++ b/versioned_docs/version-7.0/start/installation/setup-wizard.mdx
@@ -661,7 +661,7 @@ In the **Unsecure Mode**, all you need to do is specify the **IP address** and *
                    This new cluster will only contain this node.  
    * **Unchecked** - The server will Not be created in a cluster.  
                      The server will be created in a 
-                     [Passive State](../../studio/cluster/cluster-view.mdx#cluster-nodes-states-&-types-flow) 
+                     [Passive State](../../studio/cluster/cluster-view.mdx#cluster-nodes-states--types-flow) 
                      and can later be added to an already existing cluster.  
 
 4. **Environment**  
diff --git a/versioned_docs/version-7.0/start/licensing/renew-license.mdx b/versioned_docs/version-7.0/start/licensing/renew-license.mdx
index 4de1e81a5e..e237e84d40 100644
--- a/versioned_docs/version-7.0/start/licensing/renew-license.mdx
+++ b/versioned_docs/version-7.0/start/licensing/renew-license.mdx
@@ -24,7 +24,7 @@ import LanguageContent from "@site/src/components/LanguageContent";
 
 * In this page:
     * [Renew commercial licenses](../../start/licensing/renew-license.mdx#renew-commercial-licenses)
-    * [Renew Developer & Community licenses](../../start/licensing/renew-license.mdx#renew-developer-&-community-licenses)
+    * [Renew Developer & Community licenses](../../start/licensing/renew-license.mdx#renew-developer--community-licenses)
 
 </Admonition>
 ## Renew commercial licenses
diff --git a/versioned_docs/version-7.0/studio/cluster/cluster-view.mdx b/versioned_docs/version-7.0/studio/cluster/cluster-view.mdx
index 51f7e5e122..2d539e56b5 100644
--- a/versioned_docs/version-7.0/studio/cluster/cluster-view.mdx
+++ b/versioned_docs/version-7.0/studio/cluster/cluster-view.mdx
@@ -34,7 +34,7 @@ import LanguageContent from "@site/src/components/LanguageContent";
   * [Cluster View Operations](../../studio/cluster/cluster-view.mdx#cluster-view-operations)  
   * [Reassign Cores](../../studio/cluster/cluster-view.mdx#reassign-cores)  
   * [Cluster Nodes Types](../../studio/cluster/cluster-view.mdx#cluster-nodes-types)  
-  * [Cluster Nodes States & Types Flow](../../studio/cluster/cluster-view.mdx#cluster-nodes-states-&-types-flow)  
+  * [Cluster Nodes States & Types Flow](../../studio/cluster/cluster-view.mdx#cluster-nodes-states--types-flow)  
   * [Cluster-Wide operation -vs- Database Operations](../../studio/cluster/cluster-view.mdx#cluster-wide-operation--vs--database-operations)  
 </Admonition>
 ## Cluster View Stats
diff --git a/versioned_docs/version-7.0/studio/database/indexes/create-map-index.mdx b/versioned_docs/version-7.0/studio/database/indexes/create-map-index.mdx
index f47ef2385a..db556daae3 100644
--- a/versioned_docs/version-7.0/studio/database/indexes/create-map-index.mdx
+++ b/versioned_docs/version-7.0/studio/database/indexes/create-map-index.mdx
@@ -21,7 +21,7 @@ import LanguageContent from "@site/src/components/LanguageContent";
 * In this page:  
   * [Edit Index View](../../../studio/database/indexes/create-map-index.mdx#edit-index-view)  
   * [Test Index](../../../studio/database/indexes/create-map-index.mdx#test-index)  
-  * [Index Fields & Terms](../../../studio/database/indexes/create-map-index.mdx#index-fields-&-terms)  
+  * [Index Fields & Terms](../../../studio/database/indexes/create-map-index.mdx#index-fields--terms)  
   * [Index Field Options](../../../studio/database/indexes/create-map-index.mdx#index-field-options)  
      * [Add Compound Field](../../../studio/database/indexes/create-map-index.mdx#add-compound-field)  
   * [Configuration](../../../studio/database/indexes/create-map-index.mdx#configuration)  
@@ -41,7 +41,7 @@ import LanguageContent from "@site/src/components/LanguageContent";
 2. Options available for an already saved index:  
    **Copy C#** - Click to view and copy the C# class that defines the index as set in the Studio.  
    **Query** - Click to go the the Query View and query this index.  
-   **Terms** - Click to see the index terms, see [below](../../../studio/database/indexes/create-map-index.mdx#index-fields-&-terms).  
+   **Terms** - Click to see the index terms, see [below](../../../studio/database/indexes/create-map-index.mdx#index-fields--terms).  
    **Advanced** - Click to dump the raw index or optimize it.  
    **Delete** - Delete this index.