diff --git a/content/influxdb/v2.0/backup-restore/_index.md b/content/influxdb/v2.0/backup-restore/_index.md
index ad93f093c..e5ddfdf17 100644
--- a/content/influxdb/v2.0/backup-restore/_index.md
+++ b/content/influxdb/v2.0/backup-restore/_index.md
@@ -4,7 +4,7 @@ seotitle: Backup and restore data with InfluxDB
 description: >
   InfluxDB provides tools that let you back up and restore data and metadata stored
   in InfluxDB.
-v2.0/tags: [backup, restore]
+influxdb/v2.0/tags: [backup, restore]
 aliases:
   - /v2.0/backup-restore
 menu:
diff --git a/content/influxdb/v2.0/backup-restore/restore.md b/content/influxdb/v2.0/backup-restore/restore.md
index e606d5bdb..63b6b738c 100644
--- a/content/influxdb/v2.0/backup-restore/restore.md
+++ b/content/influxdb/v2.0/backup-restore/restore.md
@@ -7,7 +7,7 @@ menu:
   influxdb_2_0:
     parent: Back up & restore data
 weight: 101
-v2.0/tags: [restore]
+influxdb/v2.0/tags: [restore]
 aliases:
   - /v2.0/backup-restore/restore
 related:
diff --git a/content/influxdb/v2.0/get-started.md b/content/influxdb/v2.0/get-started.md
index f1e616bdc..481b5fa0a 100644
--- a/content/influxdb/v2.0/get-started.md
+++ b/content/influxdb/v2.0/get-started.md
@@ -5,7 +5,7 @@ menu:
   influxdb_2_0:
     name: Get started
 weight: 1
-v2.0/tags: [get-started, install]
+influxdb/v2.0/tags: [get-started, install]
 aliases:
   - /v2.0/cloud/get-started
   - /v2.0/get-started
diff --git a/content/influxdb/v2.0/influxdb-templates/_index.md b/content/influxdb/v2.0/influxdb-templates/_index.md
index 23dffe0af..651399ce3 100644
--- a/content/influxdb/v2.0/influxdb-templates/_index.md
+++ b/content/influxdb/v2.0/influxdb-templates/_index.md
@@ -7,7 +7,7 @@ menu: influxdb_2_0
 weight: 9
 aliases:
   - /v2.0/influxdb-templates
-v2.0/tags: [templates]
+influxdb/v2.0/tags: [templates]
 ---
 
 InfluxDB templates are prepackaged InfluxDB configurations that contain everything
diff --git a/content/influxdb/v2.0/influxdb-templates/cloud.md b/content/influxdb/v2.0/influxdb-templates/cloud.md
index 0396e8680..8ec167a94 100644
--- a/content/influxdb/v2.0/influxdb-templates/cloud.md
+++ b/content/influxdb/v2.0/influxdb-templates/cloud.md
@@ -12,7 +12,7 @@ weight: 101
 aliases:
   - /v2.0/influxdb-templates/get_started_cloud/
   - /v2.0/influxdb-templates/cloud/
-v2.0/tags: [templates]
+influxdb/v2.0/tags: [templates]
 products: [cloud]
 ---
 
diff --git a/content/influxdb/v2.0/influxdb-templates/create.md b/content/influxdb/v2.0/influxdb-templates/create.md
index e9c002b1c..b9da82112 100644
--- a/content/influxdb/v2.0/influxdb-templates/create.md
+++ b/content/influxdb/v2.0/influxdb-templates/create.md
@@ -10,7 +10,7 @@ menu:
 weight: 103
 aliases:
   - /v2.0/influxdb-templates/create/
-v2.0/tags: [templates]
+influxdb/v2.0/tags: [templates]
 related:
   - /influxdb/v2.0/reference/cli/influx/export/
   - /influxdb/v2.0/reference/cli/influx/export/all/
diff --git a/content/influxdb/v2.0/influxdb-templates/use.md b/content/influxdb/v2.0/influxdb-templates/use.md
index 3d01ed025..f51c0db10 100644
--- a/content/influxdb/v2.0/influxdb-templates/use.md
+++ b/content/influxdb/v2.0/influxdb-templates/use.md
@@ -10,7 +10,7 @@ menu:
 weight: 102
 aliases:
   - /v2.0/influxdb-templates/use/
-v2.0/tags: [templates]
+influxdb/v2.0/tags: [templates]
 related:
   - /influxdb/v2.0/reference/cli/influx/apply/
   - /influxdb/v2.0/reference/cli/influx/template/
diff --git a/content/influxdb/v2.0/monitor-alert/_index.md b/content/influxdb/v2.0/monitor-alert/_index.md
index 70a230df3..7ffbcd277 100644
--- a/content/influxdb/v2.0/monitor-alert/_index.md
+++ b/content/influxdb/v2.0/monitor-alert/_index.md
@@ -10,7 +10,7 @@ menu:
 weight: 6
 aliases:
   - /v2.0/monitor-alert/
-v2.0/tags: [monitor, alert, checks, notification, endpoints]
+influxdb/v2.0/tags: [monitor, alert, checks, notification, endpoints]
 ---
 
 Monitor your time series data and send alerts by creating checks, notification
diff --git a/content/influxdb/v2.0/monitor-alert/checks/_index.md b/content/influxdb/v2.0/monitor-alert/checks/_index.md
index b3f287622..bc3ae3e1c 100644
--- a/content/influxdb/v2.0/monitor-alert/checks/_index.md
+++ b/content/influxdb/v2.0/monitor-alert/checks/_index.md
@@ -9,7 +9,7 @@ menu:
 weight: 101
 aliases:
   - /v2.0/monitor-alert/checks/
-v2.0/tags: [monitor, checks, notifications, alert]
+influxdb/v2.0/tags: [monitor, checks, notifications, alert]
 related:
   - /influxdb/v2.0/monitor-alert/notification-rules/
   - /influxdb/v2.0/monitor-alert/notification-endpoints/
diff --git a/content/influxdb/v2.0/monitor-alert/notification-endpoints/_index.md b/content/influxdb/v2.0/monitor-alert/notification-endpoints/_index.md
index 8cdef535a..6bf9e58e8 100644
--- a/content/influxdb/v2.0/monitor-alert/notification-endpoints/_index.md
+++ b/content/influxdb/v2.0/monitor-alert/notification-endpoints/_index.md
@@ -3,7 +3,7 @@ title: Manage notification endpoints
 list_title: Manage notification endpoints
 description: >
   Create, read, update, and delete endpoints in the InfluxDB UI.
-v2.0/tags: [monitor, endpoints, notifications, alert]
+influxdb/v2.0/tags: [monitor, endpoints, notifications, alert]
 menu:
   influxdb_2_0:
     parent: Monitor & alert
diff --git a/content/influxdb/v2.0/monitor-alert/notification-rules/_index.md b/content/influxdb/v2.0/monitor-alert/notification-rules/_index.md
index a6cdc5e19..317e2d8ea 100644
--- a/content/influxdb/v2.0/monitor-alert/notification-rules/_index.md
+++ b/content/influxdb/v2.0/monitor-alert/notification-rules/_index.md
@@ -5,7 +5,7 @@ description: >
 weight: 103
 aliases:
   - /v2.0/monitor-alert/notification-rules/
-v2.0/tags: [monitor, notifications, alert]
+influxdb/v2.0/tags: [monitor, notifications, alert]
 menu:
   influxdb_2_0:
     parent: Monitor & alert
diff --git a/content/influxdb/v2.0/organizations/_index.md b/content/influxdb/v2.0/organizations/_index.md
index c041f70e8..7a61893c8 100644
--- a/content/influxdb/v2.0/organizations/_index.md
+++ b/content/influxdb/v2.0/organizations/_index.md
@@ -8,7 +8,7 @@ menu:
   influxdb_2_0:
     name: Manage organizations
 weight: 10
-v2.0/tags: [organizations]
+influxdb/v2.0/tags: [organizations]
 ---
 
 An **organization** is a workspace for a group of users.
diff --git a/content/influxdb/v2.0/organizations/buckets/_index.md b/content/influxdb/v2.0/organizations/buckets/_index.md
index fd89c0e13..9770bb491 100644
--- a/content/influxdb/v2.0/organizations/buckets/_index.md
+++ b/content/influxdb/v2.0/organizations/buckets/_index.md
@@ -9,7 +9,7 @@ menu:
 weight: 105
 aliases:
   - /v2.0/organizations/create-org/buckets/
-v2.0/tags: [buckets]
+influxdb/v2.0/tags: [buckets]
 ---
 
 A **bucket** is a named location where time series data is stored.
diff --git a/content/influxdb/v2.0/organizations/members/_index.md b/content/influxdb/v2.0/organizations/members/_index.md
index 8f3759ee2..1e591a915 100644
--- a/content/influxdb/v2.0/organizations/members/_index.md
+++ b/content/influxdb/v2.0/organizations/members/_index.md
@@ -9,7 +9,7 @@ menu:
 weight: 106
 aliases:
   - /v2.0/organizations/create-org/members/
-v2.0/tags: [members]
+influxdb/v2.0/tags: [members]
 ---
 
 A **member** is a user that belongs to an organization.
diff --git a/content/influxdb/v2.0/process-data/_index.md b/content/influxdb/v2.0/process-data/_index.md
index 7485762b9..3d0b9849c 100644
--- a/content/influxdb/v2.0/process-data/_index.md
+++ b/content/influxdb/v2.0/process-data/_index.md
@@ -10,7 +10,7 @@ menu:
 weight: 4
 aliases:
   - /v2.0/process-data/
-v2.0/tags: [tasks]
+influxdb/v2.0/tags: [tasks]
 ---
 
 Process and analyze your data with tasks in the InfluxDB **task engine**. Use tasks (scheduled Flux queries)
diff --git a/content/influxdb/v2.0/process-data/common-tasks/_index.md b/content/influxdb/v2.0/process-data/common-tasks/_index.md
index 11dca9348..cfff29536 100644
--- a/content/influxdb/v2.0/process-data/common-tasks/_index.md
+++ b/content/influxdb/v2.0/process-data/common-tasks/_index.md
@@ -4,7 +4,7 @@ seotitle: Common data processing tasks performed with with InfluxDB
 description: >
   InfluxDB Tasks process data on specified schedules.
   This collection of articles walks through common use cases for InfluxDB tasks.
-v2.0/tags: [tasks]
+influxdb/v2.0/tags: [tasks]
 menu:
   influxdb_2_0:
     name: Common tasks
diff --git a/content/influxdb/v2.0/process-data/common-tasks/downsample-data.md b/content/influxdb/v2.0/process-data/common-tasks/downsample-data.md
index 909935167..5154bd228 100644
--- a/content/influxdb/v2.0/process-data/common-tasks/downsample-data.md
+++ b/content/influxdb/v2.0/process-data/common-tasks/downsample-data.md
@@ -11,7 +11,7 @@ menu:
 weight: 201
 aliases:
   - /v2.0/process-data/common-tasks/downsample-data/
-v2.0/tags: [tasks]
+influxdb/v2.0/tags: [tasks]
 ---
 
 One of the most common use cases for InfluxDB tasks is downsampling data to reduce
diff --git a/content/influxdb/v2.0/process-data/get-started.md b/content/influxdb/v2.0/process-data/get-started.md
index a036d74f9..b849205c0 100644
--- a/content/influxdb/v2.0/process-data/get-started.md
+++ b/content/influxdb/v2.0/process-data/get-started.md
@@ -7,7 +7,7 @@ description: >
 aliases:
   - /v2.0/process-data/write-a-task/
   - /v2.0/process-data/get-started/
-v2.0/tags: [tasks]
+influxdb/v2.0/tags: [tasks]
 menu:
   influxdb_2_0:
     name: Get started with tasks
diff --git a/content/influxdb/v2.0/process-data/manage-tasks/_index.md b/content/influxdb/v2.0/process-data/manage-tasks/_index.md
index 8bb9aaaa1..10fe5ee13 100644
--- a/content/influxdb/v2.0/process-data/manage-tasks/_index.md
+++ b/content/influxdb/v2.0/process-data/manage-tasks/_index.md
@@ -5,7 +5,7 @@ list_title: Manage tasks
 description: >
   InfluxDB provides options for creating, reading, updating, and deleting tasks
   using both the `influx` CLI and the InfluxDB UI.
-v2.0/tags: [tasks]
+influxdb/v2.0/tags: [tasks]
 menu:
   influxdb_2_0:
     name: Manage tasks
diff --git a/content/influxdb/v2.0/process-data/task-options.md b/content/influxdb/v2.0/process-data/task-options.md
index b4266f332..b24c741c1 100644
--- a/content/influxdb/v2.0/process-data/task-options.md
+++ b/content/influxdb/v2.0/process-data/task-options.md
@@ -11,7 +11,7 @@ menu:
 weight: 105
 aliases:
   - /v2.0/process-data/task-options/
-v2.0/tags: [tasks, flux]
+influxdb/v2.0/tags: [tasks, flux]
 ---
 
 Task options define specific information about a task.
diff --git a/content/influxdb/v2.0/query-data/_index.md b/content/influxdb/v2.0/query-data/_index.md
index 9c05573bb..b8d677c18 100644
--- a/content/influxdb/v2.0/query-data/_index.md
+++ b/content/influxdb/v2.0/query-data/_index.md
@@ -10,7 +10,7 @@ menu:
 weight: 3
 aliases:
   - /v2.0/query-data/
-v2.0/tags: [query, flux]
+influxdb/v2.0/tags: [query, flux]
 ---
 
 Learn to query data stored in InfluxDB using Flux and tools such as the InfluxDB
diff --git a/content/influxdb/v2.0/query-data/execute-queries.md b/content/influxdb/v2.0/query-data/execute-queries.md
index ab8cd6070..7bc163189 100644
--- a/content/influxdb/v2.0/query-data/execute-queries.md
+++ b/content/influxdb/v2.0/query-data/execute-queries.md
@@ -9,7 +9,7 @@ menu:
   influxdb_2_0:
     name: Execute queries
     parent: Query data
-v2.0/tags: [query]
+influxdb/v2.0/tags: [query]
 ---
 
 There are multiple ways to execute queries with InfluxDB.
diff --git a/content/influxdb/v2.0/query-data/flux/_index.md b/content/influxdb/v2.0/query-data/flux/_index.md
index 1984cb235..e3dc92582 100644
--- a/content/influxdb/v2.0/query-data/flux/_index.md
+++ b/content/influxdb/v2.0/query-data/flux/_index.md
@@ -2,7 +2,7 @@
 title: Query data with Flux
 description: Guides that walk through both common and complex queries and use cases for Flux.
 weight: 102
-v2.0/tags: [flux, query]
+influxdb/v2.0/tags: [flux, query]
 menu:
   influxdb_2_0:
     name: Query with Flux
diff --git a/content/influxdb/v2.0/query-data/flux/conditional-logic.md b/content/influxdb/v2.0/query-data/flux/conditional-logic.md
index 6bf212aed..2e77abcfc 100644
--- a/content/influxdb/v2.0/query-data/flux/conditional-logic.md
+++ b/content/influxdb/v2.0/query-data/flux/conditional-logic.md
@@ -5,7 +5,7 @@ list_title: Conditional logic
 description: >
   This guide describes how to use Flux conditional expressions, such as `if`,
   `else`, and `then`, to query and transform data. **Flux evaluates statements from left to right and stops evaluating once a condition matches.**
-v2.0/tags: [conditionals, flux]
+influxdb/v2.0/tags: [conditionals, flux]
 menu:
   influxdb_2_0:
     name: Conditional logic
diff --git a/content/influxdb/v2.0/query-data/flux/cumulativesum.md b/content/influxdb/v2.0/query-data/flux/cumulativesum.md
index 0f2fa75a9..efe78f56d 100644
--- a/content/influxdb/v2.0/query-data/flux/cumulativesum.md
+++ b/content/influxdb/v2.0/query-data/flux/cumulativesum.md
@@ -9,7 +9,7 @@ menu:
   influxdb_2_0:
     parent: Query with Flux
     name: Cumulative sum
-v2.0/tags: [query, cumulative sum]
+influxdb/v2.0/tags: [query, cumulative sum]
 aliases:
   - /v2.0/query-data/flux/cumulativesum/
 related:
diff --git a/content/influxdb/v2.0/query-data/flux/custom-functions/_index.md b/content/influxdb/v2.0/query-data/flux/custom-functions/_index.md
index f613d661b..def8fe197 100644
--- a/content/influxdb/v2.0/query-data/flux/custom-functions/_index.md
+++ b/content/influxdb/v2.0/query-data/flux/custom-functions/_index.md
@@ -2,7 +2,7 @@
 title: Create custom Flux functions
 description: Create your own custom Flux functions to transform and manipulate data.
 list_title: Custom functions
-v2.0/tags: [functions, custom, flux]
+influxdb/v2.0/tags: [functions, custom, flux]
 menu:
   influxdb_2_0:
     name: Custom functions
diff --git a/content/influxdb/v2.0/query-data/flux/custom-functions/custom-aggregate.md b/content/influxdb/v2.0/query-data/flux/custom-functions/custom-aggregate.md
index 6d12552e8..ff4f1db5f 100644
--- a/content/influxdb/v2.0/query-data/flux/custom-functions/custom-aggregate.md
+++ b/content/influxdb/v2.0/query-data/flux/custom-functions/custom-aggregate.md
@@ -1,7 +1,7 @@
 ---
 title: Create custom aggregate functions
 description: Create your own custom aggregate functions in Flux using the `reduce()` function.
-v2.0/tags: [functions, custom, flux, aggregates]
+influxdb/v2.0/tags: [functions, custom, flux, aggregates]
 menu:
   influxdb_2_0:
     name: Custom aggregate functions
diff --git a/content/influxdb/v2.0/query-data/flux/exists.md b/content/influxdb/v2.0/query-data/flux/exists.md
index fa011e531..b45024a88 100644
--- a/content/influxdb/v2.0/query-data/flux/exists.md
+++ b/content/influxdb/v2.0/query-data/flux/exists.md
@@ -5,7 +5,7 @@ list_title: Exists
 description: >
   Use the Flux `exists` operator to check if a record contains a key or if that
   key's value is `null`.
-v2.0/tags: [exists]
+influxdb/v2.0/tags: [exists]
 menu:
   influxdb_2_0:
     name: Exists
diff --git a/content/influxdb/v2.0/query-data/flux/explore-schema.md b/content/influxdb/v2.0/query-data/flux/explore-schema.md
index 77176829a..eb876f918 100644
--- a/content/influxdb/v2.0/query-data/flux/explore-schema.md
+++ b/content/influxdb/v2.0/query-data/flux/explore-schema.md
@@ -4,7 +4,7 @@ list_title: Explore your schema
 description: >
   Flux provides functions that let you explore the structure and schema of your
   data stored in InfluxDB.
-v2.0/tags: [schema]
+influxdb/v2.0/tags: [schema]
 menu:
   influxdb_2_0:
     name: Explore your schema
diff --git a/content/influxdb/v2.0/query-data/flux/fill.md b/content/influxdb/v2.0/query-data/flux/fill.md
index 29046697c..9d34f02ef 100644
--- a/content/influxdb/v2.0/query-data/flux/fill.md
+++ b/content/influxdb/v2.0/query-data/flux/fill.md
@@ -12,7 +12,7 @@ menu:
   influxdb_2_0:
     parent: Query with Flux
     name: Fill
-v2.0/tags: [query, fill]
+influxdb/v2.0/tags: [query, fill]
 related:
   - /v2.0/reference/flux/stdlib/built-in/transformations/fill/
 list_query_example: fill_null
diff --git a/content/influxdb/v2.0/query-data/flux/first-last.md b/content/influxdb/v2.0/query-data/flux/first-last.md
index ae12ba029..194006e38 100644
--- a/content/influxdb/v2.0/query-data/flux/first-last.md
+++ b/content/influxdb/v2.0/query-data/flux/first-last.md
@@ -13,7 +13,7 @@ menu:
   influxdb_2_0:
     parent: Query with Flux
     name: First & last
-v2.0/tags: [query]
+influxdb/v2.0/tags: [query]
 related:
   - /v2.0/reference/flux/stdlib/built-in/transformations/selectors/first/
   - /v2.0/reference/flux/stdlib/built-in/transformations/selectors/last/
diff --git a/content/influxdb/v2.0/query-data/flux/group-data.md b/content/influxdb/v2.0/query-data/flux/group-data.md
index 261bd05fe..5904475e4 100644
--- a/content/influxdb/v2.0/query-data/flux/group-data.md
+++ b/content/influxdb/v2.0/query-data/flux/group-data.md
@@ -4,7 +4,7 @@ list_title: Group
 description: >
   Use the [`group()` function](/v2.0/reference/flux/stdlib/built-in/transformations/group)
   to group data with common values in specific columns.
-v2.0/tags: [group]
+influxdb/v2.0/tags: [group]
 menu:
   influxdb_2_0:
     name: Group
diff --git a/content/influxdb/v2.0/query-data/flux/histograms.md b/content/influxdb/v2.0/query-data/flux/histograms.md
index 5cbd455a4..2682db59f 100644
--- a/content/influxdb/v2.0/query-data/flux/histograms.md
+++ b/content/influxdb/v2.0/query-data/flux/histograms.md
@@ -4,7 +4,7 @@ list_title: Histograms
 description: >
   Use the [`histogram()` function](/v2.0/reference/flux/stdlib/built-in/transformations/histogram/)
   to create cumulative histograms with Flux.
-v2.0/tags: [histogram]
+influxdb/v2.0/tags: [histogram]
 menu:
   influxdb_2_0:
     name: Histograms
diff --git a/content/influxdb/v2.0/query-data/flux/increase.md b/content/influxdb/v2.0/query-data/flux/increase.md
index a0cd6540b..d1750b652 100644
--- a/content/influxdb/v2.0/query-data/flux/increase.md
+++ b/content/influxdb/v2.0/query-data/flux/increase.md
@@ -14,7 +14,7 @@ menu:
   influxdb_2_0:
     parent: Query with Flux
     name: Increase
-v2.0/tags: [query, increase, counters]
+influxdb/v2.0/tags: [query, increase, counters]
 related:
   - /v2.0/reference/flux/stdlib/built-in/transformations/aggregates/increase/
 list_query_example: increase
diff --git a/content/influxdb/v2.0/query-data/flux/join.md b/content/influxdb/v2.0/query-data/flux/join.md
index de177413b..3106d63cb 100644
--- a/content/influxdb/v2.0/query-data/flux/join.md
+++ b/content/influxdb/v2.0/query-data/flux/join.md
@@ -3,7 +3,7 @@ title: Join data with Flux
 seotitle: Join data in InfluxDB with Flux
 list_title: Join
 description: This guide walks through joining data with Flux and outlines how it shapes your data in the process.
-v2.0/tags: [join, flux]
+influxdb/v2.0/tags: [join, flux]
 menu:
   influxdb_2_0:
     name: Join
diff --git a/content/influxdb/v2.0/query-data/flux/mathematic-operations.md b/content/influxdb/v2.0/query-data/flux/mathematic-operations.md
index 9c82b2b01..51d651fa6 100644
--- a/content/influxdb/v2.0/query-data/flux/mathematic-operations.md
+++ b/content/influxdb/v2.0/query-data/flux/mathematic-operations.md
@@ -5,7 +5,7 @@ list_title: Transform data with math
 description: >
   Use the [`map()` function](/v2.0/reference/flux/stdlib/built-in/transformations/map)
   to remap column values and apply mathematic operations.
-v2.0/tags: [math, flux]
+influxdb/v2.0/tags: [math, flux]
 menu:
   influxdb_2_0:
     name: Transform data with math
diff --git a/content/influxdb/v2.0/query-data/flux/median.md b/content/influxdb/v2.0/query-data/flux/median.md
index 77d807e42..3b79127dd 100644
--- a/content/influxdb/v2.0/query-data/flux/median.md
+++ b/content/influxdb/v2.0/query-data/flux/median.md
@@ -12,7 +12,7 @@ menu:
   influxdb_2_0:
     parent: Query with Flux
     name: Median
-v2.0/tags: [query, median]
+influxdb/v2.0/tags: [query, median]
 related:
   - /influxdb/v2.0/query-data/flux/percentile-quantile/
   - /v2.0/reference/flux/stdlib/built-in/transformations/aggregates/median/
diff --git a/content/influxdb/v2.0/query-data/flux/monitor-states.md b/content/influxdb/v2.0/query-data/flux/monitor-states.md
index 0c1f35c02..356ebee3b 100644
--- a/content/influxdb/v2.0/query-data/flux/monitor-states.md
+++ b/content/influxdb/v2.0/query-data/flux/monitor-states.md
@@ -2,7 +2,7 @@
 title: Monitor states
 seotitle: Monitor states and state changes in your events and metrics with Flux.
 description: Flux provides several functions to help monitor states and state changes in your data.
-v2.0/tags: [states, monitor, flux]
+influxdb/v2.0/tags: [states, monitor, flux]
 menu:
   influxdb_2_0:
     name: Monitor states
diff --git a/content/influxdb/v2.0/query-data/flux/moving-average.md b/content/influxdb/v2.0/query-data/flux/moving-average.md
index c9f71a559..e1e1abb46 100644
--- a/content/influxdb/v2.0/query-data/flux/moving-average.md
+++ b/content/influxdb/v2.0/query-data/flux/moving-average.md
@@ -13,7 +13,7 @@ menu:
   influxdb_2_0:
     parent: Query with Flux
     name: Moving Average
-v2.0/tags: [query, moving average]
+influxdb/v2.0/tags: [query, moving average]
 related:
   - /v2.0/reference/flux/stdlib/built-in/transformations/movingaverage/
   - /v2.0/reference/flux/stdlib/built-in/transformations/aggregates/timedmovingaverage/
diff --git a/content/influxdb/v2.0/query-data/flux/percentile-quantile.md b/content/influxdb/v2.0/query-data/flux/percentile-quantile.md
index e47ed338a..006ce2853 100644
--- a/content/influxdb/v2.0/query-data/flux/percentile-quantile.md
+++ b/content/influxdb/v2.0/query-data/flux/percentile-quantile.md
@@ -12,7 +12,7 @@ menu:
   influxdb_2_0:
     parent: Query with Flux
     name: Percentile & quantile
-v2.0/tags: [query, percentile, quantile]
+influxdb/v2.0/tags: [query, percentile, quantile]
 related:
   - /influxdb/v2.0/query-data/flux/query-median/
   - /v2.0/reference/flux/stdlib/built-in/transformations/aggregates/quantile/
diff --git a/content/influxdb/v2.0/query-data/flux/query-fields.md b/content/influxdb/v2.0/query-data/flux/query-fields.md
index 6af78338b..0389b1931 100644
--- a/content/influxdb/v2.0/query-data/flux/query-fields.md
+++ b/content/influxdb/v2.0/query-data/flux/query-fields.md
@@ -11,7 +11,7 @@ aliases:
 menu:
   influxdb_2_0:
     parent: Query with Flux
-v2.0/tags: [query, select, where]
+influxdb/v2.0/tags: [query, select, where]
 related:
   - /v2.0/reference/flux/stdlib/built-in/transformations/filter/
   - /influxdb/v2.0/query-data/flux/conditional-logic/
diff --git a/content/influxdb/v2.0/query-data/flux/rate.md b/content/influxdb/v2.0/query-data/flux/rate.md
index b532ebb33..4d8d30641 100644
--- a/content/influxdb/v2.0/query-data/flux/rate.md
+++ b/content/influxdb/v2.0/query-data/flux/rate.md
@@ -16,7 +16,7 @@ menu:
   influxdb_2_0:
     parent: Query with Flux
     name: Rate
-v2.0/tags: [query, rate]
+influxdb/v2.0/tags: [query, rate]
 related:
   - /v2.0/reference/flux/stdlib/built-in/transformations/derivative/
   - /v2.0/reference/flux/stdlib/experimental/aggregate/rate/
diff --git a/content/influxdb/v2.0/query-data/flux/regular-expressions.md b/content/influxdb/v2.0/query-data/flux/regular-expressions.md
index 029fb9c28..b01f2df18 100644
--- a/content/influxdb/v2.0/query-data/flux/regular-expressions.md
+++ b/content/influxdb/v2.0/query-data/flux/regular-expressions.md
@@ -2,7 +2,7 @@
 title: Use regular expressions in Flux
 list_title: Regular expressions
 description: This guide walks through using regular expressions in evaluation logic in Flux functions.
-v2.0/tags: [regex]
+influxdb/v2.0/tags: [regex]
 menu:
   influxdb_2_0:
     name: Regular expressions
diff --git a/content/influxdb/v2.0/query-data/flux/scalar-values.md b/content/influxdb/v2.0/query-data/flux/scalar-values.md
index 645c2d82a..1f10415f6 100644
--- a/content/influxdb/v2.0/query-data/flux/scalar-values.md
+++ b/content/influxdb/v2.0/query-data/flux/scalar-values.md
@@ -9,7 +9,7 @@ menu:
     name: Extract scalar values
     parent:  Query with Flux
 weight: 220
-v2.0/tags: [scalar]
+influxdb/v2.0/tags: [scalar]
 related:
   - /v2.0/reference/flux/stdlib/built-in/transformations/stream-table/
 aliases:
diff --git a/content/influxdb/v2.0/query-data/flux/sort-limit.md b/content/influxdb/v2.0/query-data/flux/sort-limit.md
index 0bda6339a..5d060a09f 100644
--- a/content/influxdb/v2.0/query-data/flux/sort-limit.md
+++ b/content/influxdb/v2.0/query-data/flux/sort-limit.md
@@ -7,7 +7,7 @@ description: >
   to order records within each table by specific columns and the
   [`limit()` function](/v2.0/reference/flux/stdlib/built-in/transformations/limit)
   to limit the number of records in output tables to a fixed number, `n`.
-v2.0/tags: [sort, limit]
+influxdb/v2.0/tags: [sort, limit]
 menu:
   influxdb_2_0:
     name: Sort and limit
diff --git a/content/influxdb/v2.0/query-data/flux/sql.md b/content/influxdb/v2.0/query-data/flux/sql.md
index b3b23375b..8e91357fb 100644
--- a/content/influxdb/v2.0/query-data/flux/sql.md
+++ b/content/influxdb/v2.0/query-data/flux/sql.md
@@ -6,7 +6,7 @@ description: >
   The Flux `sql` package provides functions for working with SQL data sources.
   Use `sql.from()` to query SQL databases like PostgreSQL, MySQL, Snowflake,
   SQLite, Microsoft SQL Server, and Amazon Athena.
-v2.0/tags: [query, flux, sql]
+influxdb/v2.0/tags: [query, flux, sql]
 menu:
   influxdb_2_0:
     parent: Query with Flux
diff --git a/content/influxdb/v2.0/query-data/flux/window-aggregate.md b/content/influxdb/v2.0/query-data/flux/window-aggregate.md
index 7ed67500b..6acb098a1 100644
--- a/content/influxdb/v2.0/query-data/flux/window-aggregate.md
+++ b/content/influxdb/v2.0/query-data/flux/window-aggregate.md
@@ -10,7 +10,7 @@ menu:
     name: Window & aggregate
     parent: Query with Flux
 weight: 204
-v2.0/tags: [flux, aggregates]
+influxdb/v2.0/tags: [flux, aggregates]
 aliases:
   - /v2.0/query-data/guides/window-aggregate/
   - /v2.0/query-data/flux/window-aggregate/
diff --git a/content/influxdb/v2.0/query-data/get-started/_index.md b/content/influxdb/v2.0/query-data/get-started/_index.md
index 0c27b85ad..c86cd3739 100644
--- a/content/influxdb/v2.0/query-data/get-started/_index.md
+++ b/content/influxdb/v2.0/query-data/get-started/_index.md
@@ -6,7 +6,7 @@ description: >
 weight: 101
 aliases:
   - /v2.0/query-data/get-started/
-v2.0/tags: [query, flux, get-started]
+influxdb/v2.0/tags: [query, flux, get-started]
 menu:
   influxdb_2_0:
     name: Get started with Flux
diff --git a/content/influxdb/v2.0/query-data/get-started/query-influxdb.md b/content/influxdb/v2.0/query-data/get-started/query-influxdb.md
index 46969d60b..3aa82a494 100644
--- a/content/influxdb/v2.0/query-data/get-started/query-influxdb.md
+++ b/content/influxdb/v2.0/query-data/get-started/query-influxdb.md
@@ -1,7 +1,7 @@
 ---
 title: Query InfluxDB with Flux
 description: Learn the basics of using Flux to query data from InfluxDB.
-v2.0/tags: [query, flux]
+influxdb/v2.0/tags: [query, flux]
 menu:
   influxdb_2_0:
     name: Query InfluxDB
diff --git a/content/influxdb/v2.0/query-data/get-started/syntax-basics.md b/content/influxdb/v2.0/query-data/get-started/syntax-basics.md
index 9c1f6a5c2..6c0209f3f 100644
--- a/content/influxdb/v2.0/query-data/get-started/syntax-basics.md
+++ b/content/influxdb/v2.0/query-data/get-started/syntax-basics.md
@@ -1,7 +1,7 @@
 ---
 title: Flux syntax basics
 description: An introduction to the basic elements of the Flux syntax with real-world application examples.
-v2.0/tags: [flux, syntax]
+influxdb/v2.0/tags: [flux, syntax]
 menu:
   influxdb_2_0:
     name: Syntax basics
diff --git a/content/influxdb/v2.0/query-data/get-started/transform-data.md b/content/influxdb/v2.0/query-data/get-started/transform-data.md
index f718fa749..7e8bdd48b 100644
--- a/content/influxdb/v2.0/query-data/get-started/transform-data.md
+++ b/content/influxdb/v2.0/query-data/get-started/transform-data.md
@@ -1,7 +1,7 @@
 ---
 title: Transform data with Flux
 description: Learn the basics of using Flux to transform data queried from InfluxDB.
-v2.0/tags: [flux, transform, query]
+influxdb/v2.0/tags: [flux, transform, query]
 menu:
   influxdb_2_0:
     name: Transform data
diff --git a/content/influxdb/v2.0/query-data/influxql.md b/content/influxdb/v2.0/query-data/influxql.md
index 7df483d88..254e7728b 100644
--- a/content/influxdb/v2.0/query-data/influxql.md
+++ b/content/influxdb/v2.0/query-data/influxql.md
@@ -6,7 +6,7 @@ description: >
 weight: 10
 aliases:
   - /v2.0/query-data/influxql/
-v2.0/tags: [influxql, query]
+influxdb/v2.0/tags: [influxql, query]
 menu:
   influxdb_2_0:
     name: Query with InfluxQL
diff --git a/content/influxdb/v2.0/query-data/optimize-queries.md b/content/influxdb/v2.0/query-data/optimize-queries.md
index 70d0ce1e2..bb5d88ba1 100644
--- a/content/influxdb/v2.0/query-data/optimize-queries.md
+++ b/content/influxdb/v2.0/query-data/optimize-queries.md
@@ -9,7 +9,7 @@ menu:
   influxdb_2_0:
     name: Optimize queries
     parent: Query data
-v2.0/tags: [query]
+influxdb/v2.0/tags: [query]
 ---
 
 Optimize your Flux queries to reduce their memory and compute (CPU) requirements.
diff --git a/content/influxdb/v2.0/reference/api/_index.md b/content/influxdb/v2.0/reference/api/_index.md
index 38e2945d5..c3c0c805a 100644
--- a/content/influxdb/v2.0/reference/api/_index.md
+++ b/content/influxdb/v2.0/reference/api/_index.md
@@ -7,7 +7,7 @@ menu: influxdb_2_0_ref
 weight: 3
 aliases:
   - /v2.0/reference/api/
-v2.0/tags: [api]
+influxdb/v2.0/tags: [api]
 ---
 
 The InfluxDB v2 API provides a programmatic interface for interactions with InfluxDB.
diff --git a/content/influxdb/v2.0/reference/api/client-libraries/_index.md b/content/influxdb/v2.0/reference/api/client-libraries/_index.md
index 31498d858..aca57d1dd 100644
--- a/content/influxdb/v2.0/reference/api/client-libraries/_index.md
+++ b/content/influxdb/v2.0/reference/api/client-libraries/_index.md
@@ -11,7 +11,7 @@ menu:
   influxdb_2_0_ref:
     name: Client libraries
     parent: InfluxDB v2 API
-v2.0/tags: [client libraries]
+influxdb/v2.0/tags: [client libraries]
 ---
 
 InfluxDB client libraries are language-specific packages that integrate with the InfluxDB v2 API.
diff --git a/content/influxdb/v2.0/reference/api/client-libraries/python.md b/content/influxdb/v2.0/reference/api/client-libraries/python.md
index 7a84da149..365306e4d 100644
--- a/content/influxdb/v2.0/reference/api/client-libraries/python.md
+++ b/content/influxdb/v2.0/reference/api/client-libraries/python.md
@@ -7,7 +7,7 @@ menu:
   influxdb_2_0_ref:
     name: Python
     parent: Client libraries
-v2.0/tags: [client libraries, python]
+influxdb/v2.0/tags: [client libraries, python]
 aliases:
   - /v2.0/reference/api/client-libraries/python-cl-guide/
   - /v2.0/reference/api/client-libraries/python/
diff --git a/content/influxdb/v2.0/reference/api/influxdb-1x/_index.md b/content/influxdb/v2.0/reference/api/influxdb-1x/_index.md
index daf905eed..1aa331e79 100644
--- a/content/influxdb/v2.0/reference/api/influxdb-1x/_index.md
+++ b/content/influxdb/v2.0/reference/api/influxdb-1x/_index.md
@@ -9,7 +9,7 @@ menu:
 weight: 104
 aliases:
   - /v2.0/reference/api/influxdb-1x/
-v2.0/tags: [influxql, query, write]
+influxdb/v2.0/tags: [influxql, query, write]
 products: [cloud]
 related:
   - /influxdb/v2.0/query-data/influxql
diff --git a/content/influxdb/v2.0/reference/api/influxdb-1x/query.md b/content/influxdb/v2.0/reference/api/influxdb-1x/query.md
index 8a7414649..9f616b0a0 100644
--- a/content/influxdb/v2.0/reference/api/influxdb-1x/query.md
+++ b/content/influxdb/v2.0/reference/api/influxdb-1x/query.md
@@ -10,7 +10,7 @@ menu:
 weight: 301
 aliases:
   - /v2.0/reference/api/influxdb-1x/query/
-v2.0/tags: [influxql, query]
+influxdb/v2.0/tags: [influxql, query]
 products: [cloud]
 list_code_example: |
   <pre>
diff --git a/content/influxdb/v2.0/reference/api/influxdb-1x/write.md b/content/influxdb/v2.0/reference/api/influxdb-1x/write.md
index adfc00b0e..801176559 100644
--- a/content/influxdb/v2.0/reference/api/influxdb-1x/write.md
+++ b/content/influxdb/v2.0/reference/api/influxdb-1x/write.md
@@ -11,7 +11,7 @@ menu:
 weight: 301
 aliases:
   - /v2.0/reference/api/influxdb-1x/write/
-v2.0/tags: [write]
+influxdb/v2.0/tags: [write]
 products: [cloud]
 list_code_example: |
   <pre>
diff --git a/content/influxdb/v2.0/reference/api/postman.md b/content/influxdb/v2.0/reference/api/postman.md
index 2d2b80a04..d7a6863f1 100644
--- a/content/influxdb/v2.0/reference/api/postman.md
+++ b/content/influxdb/v2.0/reference/api/postman.md
@@ -8,7 +8,7 @@ menu:
 weight: 3
 aliases:
   - /v2.0/reference/api/postman/
-v2.0/tags: [api, authentication]
+influxdb/v2.0/tags: [api, authentication]
 ---
 
 [Postman](https://www.postman.com/) is a popular tool for exploring APIs.
diff --git a/content/influxdb/v2.0/reference/cli/_index.md b/content/influxdb/v2.0/reference/cli/_index.md
index 81334117d..1c77dc002 100644
--- a/content/influxdb/v2.0/reference/cli/_index.md
+++ b/content/influxdb/v2.0/reference/cli/_index.md
@@ -4,7 +4,7 @@ seotitle: Command line tools for managing InfluxDB
 description: >
   InfluxDB provides command line tools designed to aid in managing and working
   with InfluxDB from the command line.
-v2.0/tags: [cli]
+influxdb/v2.0/tags: [cli]
 aliases:
   - /v2.0/reference/cli/
 menu:
diff --git a/content/influxdb/v2.0/reference/cli/influx/_index.md b/content/influxdb/v2.0/reference/cli/influx/_index.md
index 01ae4d41f..1f7ca7f96 100644
--- a/content/influxdb/v2.0/reference/cli/influx/_index.md
+++ b/content/influxdb/v2.0/reference/cli/influx/_index.md
@@ -11,7 +11,7 @@ menu:
 weight: 101
 aliases:
   - /v2.0/reference/cli/influx/
-v2.0/tags: [cli]
+influxdb/v2.0/tags: [cli]
 ---
 
 The `influx` command line interface (CLI) includes commands to manage many aspects of InfluxDB,
diff --git a/content/influxdb/v2.0/reference/cli/influx/apply/_index.md b/content/influxdb/v2.0/reference/cli/influx/apply/_index.md
index 9c0da7b19..5247979c6 100644
--- a/content/influxdb/v2.0/reference/cli/influx/apply/_index.md
+++ b/content/influxdb/v2.0/reference/cli/influx/apply/_index.md
@@ -9,7 +9,7 @@ weight: 101
 aliases:
   - /v2.0/reference/cli/influx/pkg/
   - /v2.0/reference/cli/influx/apply/
-v2.0/tags: [templates]
+influxdb/v2.0/tags: [templates]
 ---
 
 The `influx apply` command applies InfluxDB templates.
diff --git a/content/influxdb/v2.0/reference/cli/influx/auth/_index.md b/content/influxdb/v2.0/reference/cli/influx/auth/_index.md
index 1af273f2b..8d462a96b 100644
--- a/content/influxdb/v2.0/reference/cli/influx/auth/_index.md
+++ b/content/influxdb/v2.0/reference/cli/influx/auth/_index.md
@@ -8,7 +8,7 @@ menu:
 weight: 101
 aliases:
   - /v2.0/reference/cli/influx/auth/
-v2.0/tags: [authentication]
+influxdb/v2.0/tags: [authentication]
 ---
 
 The `influx auth` command and its subcommands manage authorizations in InfluxDB.
diff --git a/content/influxdb/v2.0/reference/cli/influx/backup/_index.md b/content/influxdb/v2.0/reference/cli/influx/backup/_index.md
index 2cdefcbf3..f27a9dc6e 100644
--- a/content/influxdb/v2.0/reference/cli/influx/backup/_index.md
+++ b/content/influxdb/v2.0/reference/cli/influx/backup/_index.md
@@ -8,7 +8,7 @@ menu:
 weight: 101
 aliases:
   - /v2.0/reference/cli/influx/backup/
-v2.0/tags: [backup]
+influxdb/v2.0/tags: [backup]
 related:
   - /influxdb/v2.0/backup-restore/backup/
 ---
diff --git a/content/influxdb/v2.0/reference/cli/influx/bucket/_index.md b/content/influxdb/v2.0/reference/cli/influx/bucket/_index.md
index aa05ffe94..66883ec2c 100644
--- a/content/influxdb/v2.0/reference/cli/influx/bucket/_index.md
+++ b/content/influxdb/v2.0/reference/cli/influx/bucket/_index.md
@@ -8,7 +8,7 @@ menu:
 weight: 101
 aliases:
   - /v2.0/reference/cli/influx/bucket/
-v2.0/tags: [buckets]
+influxdb/v2.0/tags: [buckets]
 ---
 
 The `influx bucket` command and its subcommands manage buckets in InfluxDB.
diff --git a/content/influxdb/v2.0/reference/cli/influx/completion/_index.md b/content/influxdb/v2.0/reference/cli/influx/completion/_index.md
index 66b12508c..8fe413ba6 100644
--- a/content/influxdb/v2.0/reference/cli/influx/completion/_index.md
+++ b/content/influxdb/v2.0/reference/cli/influx/completion/_index.md
@@ -10,7 +10,7 @@ menu:
 weight: 101
 aliases:
   - /v2.0/reference/cli/influx/completion/
-v2.0/tags: [cli, tools]
+influxdb/v2.0/tags: [cli, tools]
 ---
 
 The `influx completion` command outputs `influx` shell completion scripts for a
diff --git a/content/influxdb/v2.0/reference/cli/influx/config/_index.md b/content/influxdb/v2.0/reference/cli/influx/config/_index.md
index 47174685f..6bbc5ce28 100644
--- a/content/influxdb/v2.0/reference/cli/influx/config/_index.md
+++ b/content/influxdb/v2.0/reference/cli/influx/config/_index.md
@@ -6,7 +6,7 @@ menu:
     name: influx config
     parent: influx
 weight: 101
-v2.0/tags: [config]
+influxdb/v2.0/tags: [config]
 aliases:
   - /v2.0/reference/cli/influx/config/
 ---
diff --git a/content/influxdb/v2.0/reference/cli/influx/delete/_index.md b/content/influxdb/v2.0/reference/cli/influx/delete/_index.md
index 15719b8d1..a9f089f06 100644
--- a/content/influxdb/v2.0/reference/cli/influx/delete/_index.md
+++ b/content/influxdb/v2.0/reference/cli/influx/delete/_index.md
@@ -8,7 +8,7 @@ menu:
 weight: 101
 aliases:
   - /v2.0/reference/cli/influx/delete/
-v2.0/tags: [delete]
+influxdb/v2.0/tags: [delete]
 ---
 
 The `influx delete` command deletes [points](/v2.0/reference/glossary/#point)
diff --git a/content/influxdb/v2.0/reference/cli/influx/org/_index.md b/content/influxdb/v2.0/reference/cli/influx/org/_index.md
index 6643e42f3..cd7390c42 100644
--- a/content/influxdb/v2.0/reference/cli/influx/org/_index.md
+++ b/content/influxdb/v2.0/reference/cli/influx/org/_index.md
@@ -8,7 +8,7 @@ menu:
 weight: 101
 aliases:
   - /v2.0/reference/cli/influx/org/
-v2.0/tags: [organizations]
+influxdb/v2.0/tags: [organizations]
 ---
 
 The `influx org` command and its subcommands manage organization information in InfluxDB.
diff --git a/content/influxdb/v2.0/reference/cli/influx/org/members/_index.md b/content/influxdb/v2.0/reference/cli/influx/org/members/_index.md
index a5ce21728..d7f15cdb7 100644
--- a/content/influxdb/v2.0/reference/cli/influx/org/members/_index.md
+++ b/content/influxdb/v2.0/reference/cli/influx/org/members/_index.md
@@ -8,7 +8,7 @@ menu:
 weight: 201
 aliases:
   - /v2.0/reference/cli/influx/org/members/
-v2.0/tags: [members, organizations]
+influxdb/v2.0/tags: [members, organizations]
 ---
 
 The `influx org members` command and its subcommands manage organization members in InfluxDB.
diff --git a/content/influxdb/v2.0/reference/cli/influx/ping/_index.md b/content/influxdb/v2.0/reference/cli/influx/ping/_index.md
index 2e28346ce..27b253a72 100644
--- a/content/influxdb/v2.0/reference/cli/influx/ping/_index.md
+++ b/content/influxdb/v2.0/reference/cli/influx/ping/_index.md
@@ -10,7 +10,7 @@ menu:
 weight: 101
 aliases:
   - /v2.0/reference/cli/influx/ping/
-v2.0/tags: [ping, health]
+influxdb/v2.0/tags: [ping, health]
 ---
 
 The `influx ping` command checks the health of a running InfluxDB instance by
diff --git a/content/influxdb/v2.0/reference/cli/influx/query/_index.md b/content/influxdb/v2.0/reference/cli/influx/query/_index.md
index 43661e385..67bccfef7 100644
--- a/content/influxdb/v2.0/reference/cli/influx/query/_index.md
+++ b/content/influxdb/v2.0/reference/cli/influx/query/_index.md
@@ -10,7 +10,7 @@ menu:
 weight: 101
 aliases:
   - /v2.0/reference/cli/influx/query/
-v2.0/tags: [query]
+influxdb/v2.0/tags: [query]
 ---
 
 The `influx query` command executes a literal Flux query provided as a string
diff --git a/content/influxdb/v2.0/reference/cli/influx/repl/_index.md b/content/influxdb/v2.0/reference/cli/influx/repl/_index.md
index 429d2af13..7dc8083e6 100644
--- a/content/influxdb/v2.0/reference/cli/influx/repl/_index.md
+++ b/content/influxdb/v2.0/reference/cli/influx/repl/_index.md
@@ -10,7 +10,7 @@ menu:
 weight: 101
 aliases:
   - /v2.0/reference/cli/influx/repl/
-v2.0/tags: [query]
+influxdb/v2.0/tags: [query]
 ---
 
 {{% warn %}}
diff --git a/content/influxdb/v2.0/reference/cli/influx/secret/_index.md b/content/influxdb/v2.0/reference/cli/influx/secret/_index.md
index 016ef8166..454780bb3 100644
--- a/content/influxdb/v2.0/reference/cli/influx/secret/_index.md
+++ b/content/influxdb/v2.0/reference/cli/influx/secret/_index.md
@@ -8,7 +8,7 @@ menu:
 weight: 101
 aliases:
   - /v2.0/reference/cli/influx/secret/
-v2.0/tags: [secrets]
+influxdb/v2.0/tags: [secrets]
 ---
 
 The `influx secret` command manages secrets.
diff --git a/content/influxdb/v2.0/reference/cli/influx/secret/delete.md b/content/influxdb/v2.0/reference/cli/influx/secret/delete.md
index ffca427ef..c3ddc7c98 100644
--- a/content/influxdb/v2.0/reference/cli/influx/secret/delete.md
+++ b/content/influxdb/v2.0/reference/cli/influx/secret/delete.md
@@ -8,7 +8,7 @@ menu:
 weight: 101
 aliases:
   - /v2.0/reference/cli/influx/secret/delete/
-v2.0/tags: [secrets]
+influxdb/v2.0/tags: [secrets]
 ---
 
 The `influx secret delete` command deletes secrets.
diff --git a/content/influxdb/v2.0/reference/cli/influx/secret/list.md b/content/influxdb/v2.0/reference/cli/influx/secret/list.md
index d06d56ac5..f0ceff1b4 100644
--- a/content/influxdb/v2.0/reference/cli/influx/secret/list.md
+++ b/content/influxdb/v2.0/reference/cli/influx/secret/list.md
@@ -8,7 +8,7 @@ menu:
 weight: 101
 aliases:
   - /v2.0/reference/cli/influx/secret/list/
-v2.0/tags: [secrets]
+influxdb/v2.0/tags: [secrets]
 ---
 
 The `influx secret list` command lists secret keys.
diff --git a/content/influxdb/v2.0/reference/cli/influx/secret/update.md b/content/influxdb/v2.0/reference/cli/influx/secret/update.md
index 42addc384..ded208c4c 100644
--- a/content/influxdb/v2.0/reference/cli/influx/secret/update.md
+++ b/content/influxdb/v2.0/reference/cli/influx/secret/update.md
@@ -8,7 +8,7 @@ menu:
 weight: 101
 aliases:
   - /v2.0/reference/cli/influx/secret/update/
-v2.0/tags: [secrets]
+influxdb/v2.0/tags: [secrets]
 ---
 
 The `influx secret update` command adds and updates secrets.
diff --git a/content/influxdb/v2.0/reference/cli/influx/setup/_index.md b/content/influxdb/v2.0/reference/cli/influx/setup/_index.md
index 78c832ffa..78eec1747 100644
--- a/content/influxdb/v2.0/reference/cli/influx/setup/_index.md
+++ b/content/influxdb/v2.0/reference/cli/influx/setup/_index.md
@@ -10,7 +10,7 @@ menu:
 weight: 101
 aliases:
   - /v2.0/reference/cli/influx/setup/
-v2.0/tags: [get-started]
+influxdb/v2.0/tags: [get-started]
 ---
 
 The `influx setup` command walks through the initial InfluxDB setup process,
diff --git a/content/influxdb/v2.0/reference/cli/influx/stacks/_index.md b/content/influxdb/v2.0/reference/cli/influx/stacks/_index.md
index c320de430..de0cf8461 100644
--- a/content/influxdb/v2.0/reference/cli/influx/stacks/_index.md
+++ b/content/influxdb/v2.0/reference/cli/influx/stacks/_index.md
@@ -11,7 +11,7 @@ weight: 101
 aliases:
   - /v2.0/reference/cli/influx/pkg/stack/list/
   - /v2.0/reference/cli/influx/stacks/
-v2.0/tags: [templates]
+influxdb/v2.0/tags: [templates]
 ---
 
 The `influx stacks` command and its subcommands list and manage InfluxDB stacks
diff --git a/content/influxdb/v2.0/reference/cli/influx/stacks/init.md b/content/influxdb/v2.0/reference/cli/influx/stacks/init.md
index 16b0fc1e3..e5575a34d 100644
--- a/content/influxdb/v2.0/reference/cli/influx/stacks/init.md
+++ b/content/influxdb/v2.0/reference/cli/influx/stacks/init.md
@@ -9,7 +9,7 @@ weight: 201
 aliases:
   - /v2.0/reference/cli/influx/pkg/stack/init/
   - /v2.0/reference/cli/influx/stacks/init/
-v2.0/tags: [templates]
+influxdb/v2.0/tags: [templates]
 ---
 
 The `influx stacks init` command initializes an InfluxDB stack.
diff --git a/content/influxdb/v2.0/reference/cli/influx/stacks/remove.md b/content/influxdb/v2.0/reference/cli/influx/stacks/remove.md
index 88af6fcb9..6f06fbe3f 100644
--- a/content/influxdb/v2.0/reference/cli/influx/stacks/remove.md
+++ b/content/influxdb/v2.0/reference/cli/influx/stacks/remove.md
@@ -9,7 +9,7 @@ weight: 201
 aliases:
   - /v2.0/reference/cli/influx/pkg/stack/remove/
   - /v2.0/reference/cli/influx/stacks/remove/
-v2.0/tags: [templates]
+influxdb/v2.0/tags: [templates]
 ---
 
 The `influx stacks remove` command removes an InfluxDB stack and all associated resources.
diff --git a/content/influxdb/v2.0/reference/cli/influx/stacks/update.md b/content/influxdb/v2.0/reference/cli/influx/stacks/update.md
index fcdeeb028..a2b3d8940 100644
--- a/content/influxdb/v2.0/reference/cli/influx/stacks/update.md
+++ b/content/influxdb/v2.0/reference/cli/influx/stacks/update.md
@@ -8,7 +8,7 @@ menu:
 weight: 201
 aliases:
   - /v2.0/reference/cli/influx/stacks/update/
-v2.0/tags: [templates]
+influxdb/v2.0/tags: [templates]
 ---
 
 The `influx stacks update` command updates an InfluxDB stack.
diff --git a/content/influxdb/v2.0/reference/cli/influx/task/_index.md b/content/influxdb/v2.0/reference/cli/influx/task/_index.md
index 9447aff97..fc0557050 100644
--- a/content/influxdb/v2.0/reference/cli/influx/task/_index.md
+++ b/content/influxdb/v2.0/reference/cli/influx/task/_index.md
@@ -8,7 +8,7 @@ menu:
 weight: 101
 aliases:
   - /v2.0/reference/cli/influx/task/
-v2.0/tags: [tasks]
+influxdb/v2.0/tags: [tasks]
 ---
 
 The `influx task` command and its subcommands manage tasks in InfluxDB.
diff --git a/content/influxdb/v2.0/reference/cli/influx/task/log/_index.md b/content/influxdb/v2.0/reference/cli/influx/task/log/_index.md
index 967d5adfd..f56a98d4a 100644
--- a/content/influxdb/v2.0/reference/cli/influx/task/log/_index.md
+++ b/content/influxdb/v2.0/reference/cli/influx/task/log/_index.md
@@ -10,7 +10,7 @@ menu:
 weight: 201
 aliases:
   - /v2.0/reference/cli/influx/task/log/
-v2.0/tags: [logs]
+influxdb/v2.0/tags: [logs]
 ---
 
 The `influx task log` command and its subcommand `list` output log information related to a task.
diff --git a/content/influxdb/v2.0/reference/cli/influx/telegrafs/_index.md b/content/influxdb/v2.0/reference/cli/influx/telegrafs/_index.md
index bb23a6303..f514697d2 100644
--- a/content/influxdb/v2.0/reference/cli/influx/telegrafs/_index.md
+++ b/content/influxdb/v2.0/reference/cli/influx/telegrafs/_index.md
@@ -10,7 +10,7 @@ menu:
 weight: 101
 aliases:
   - /v2.0/reference/cli/influx/telegrafs/
-v2.0/tags: [telegraf]
+influxdb/v2.0/tags: [telegraf]
 ---
 
 The `influx telegrafs` command lists Telegraf configurations.
diff --git a/content/influxdb/v2.0/reference/cli/influx/template/_index.md b/content/influxdb/v2.0/reference/cli/influx/template/_index.md
index 8262652e8..e9ffa78fb 100644
--- a/content/influxdb/v2.0/reference/cli/influx/template/_index.md
+++ b/content/influxdb/v2.0/reference/cli/influx/template/_index.md
@@ -6,7 +6,7 @@ menu:
     name: influx template
     parent: influx
 weight: 101
-v2.0/tags: [templates]
+influxdb/v2.0/tags: [templates]
 aliases:
   - /v2.0/reference/cli/influx/pkg/summary/
   - /v2.0/reference/cli/influx/template/
diff --git a/content/influxdb/v2.0/reference/cli/influx/transpile/_index.md b/content/influxdb/v2.0/reference/cli/influx/transpile/_index.md
index 6183c5a12..9f43310b5 100644
--- a/content/influxdb/v2.0/reference/cli/influx/transpile/_index.md
+++ b/content/influxdb/v2.0/reference/cli/influx/transpile/_index.md
@@ -7,7 +7,7 @@ menu:
     name: influx transpile
     parent: influx
 weight: 101
-v2.0/tags: [influxql, flux]
+influxdb/v2.0/tags: [influxql, flux]
 aliases:
   - /v2.0/reference/cli/influx/transpile/
 ---
diff --git a/content/influxdb/v2.0/reference/cli/influx/user/_index.md b/content/influxdb/v2.0/reference/cli/influx/user/_index.md
index 51e42ca12..56eb8820b 100644
--- a/content/influxdb/v2.0/reference/cli/influx/user/_index.md
+++ b/content/influxdb/v2.0/reference/cli/influx/user/_index.md
@@ -8,7 +8,7 @@ menu:
 weight: 101
 aliases:
   - /v2.0/reference/cli/influx/user/
-v2.0/tags: [users]
+influxdb/v2.0/tags: [users]
 ---
 
 The `influx user` command and its subcommands manage user information in InfluxDB.
diff --git a/content/influxdb/v2.0/reference/cli/influx/write/_index.md b/content/influxdb/v2.0/reference/cli/influx/write/_index.md
index 6dcc6b7b0..35cb3c2d6 100644
--- a/content/influxdb/v2.0/reference/cli/influx/write/_index.md
+++ b/content/influxdb/v2.0/reference/cli/influx/write/_index.md
@@ -8,7 +8,7 @@ menu:
     name: influx write
     parent: influx
 weight: 101
-v2.0/tags: [write]
+influxdb/v2.0/tags: [write]
 aliases:
   - /v2.0/reference/cli/influx/write/
 related:
diff --git a/content/influxdb/v2.0/reference/cli/influx/write/dryrun.md b/content/influxdb/v2.0/reference/cli/influx/write/dryrun.md
index 2377a0dcf..d80ba28bf 100644
--- a/content/influxdb/v2.0/reference/cli/influx/write/dryrun.md
+++ b/content/influxdb/v2.0/reference/cli/influx/write/dryrun.md
@@ -10,7 +10,7 @@ menu:
 weight: 101
 aliases:
   - /v2.0/reference/cli/influx/write/dryrun/
-v2.0/tags: [write]
+influxdb/v2.0/tags: [write]
 ---
 
 The `influx write dryrun` command prints write output to stdout instead of writing
diff --git a/content/influxdb/v2.0/reference/cli/influxd/_index.md b/content/influxdb/v2.0/reference/cli/influxd/_index.md
index 9774be84a..3aec5cca5 100644
--- a/content/influxdb/v2.0/reference/cli/influxd/_index.md
+++ b/content/influxdb/v2.0/reference/cli/influxd/_index.md
@@ -1,7 +1,7 @@
 ---
 title: influxd - InfluxDB service
 description: The `influxd` service starts and runs all the processes necessary for InfluxDB to function.
-v2.0/tags: [influxd, cli]
+influxdb/v2.0/tags: [influxd, cli]
 menu:
   influxdb_2_0_ref:
     name: influxd
diff --git a/content/influxdb/v2.0/reference/cli/influxd/generate/_index.md b/content/influxdb/v2.0/reference/cli/influxd/generate/_index.md
index 328f99ac9..be122c292 100644
--- a/content/influxdb/v2.0/reference/cli/influxd/generate/_index.md
+++ b/content/influxdb/v2.0/reference/cli/influxd/generate/_index.md
@@ -3,7 +3,7 @@ title: influxd generate
 description: >
   The `influxd generate` command generates time series data direct to disk using
   a schema defined in a TOML file.
-v2.0/tags: [sample-data]
+influxdb/v2.0/tags: [sample-data]
 menu:
   influxdb_2_0_ref:
     parent: influxd
diff --git a/content/influxdb/v2.0/reference/cli/influxd/generate/help-schema.md b/content/influxdb/v2.0/reference/cli/influxd/generate/help-schema.md
index 21cb92c71..50433475a 100644
--- a/content/influxdb/v2.0/reference/cli/influxd/generate/help-schema.md
+++ b/content/influxdb/v2.0/reference/cli/influxd/generate/help-schema.md
@@ -3,7 +3,7 @@ title: influxd generate help-schema
 description: >
   The `influxd generate help-schema` command outputs an example TOML schema to stdout
   that includes documentation describing the available options.
-v2.0/tags: [sample-data]
+influxdb/v2.0/tags: [sample-data]
 menu:
   influxdb_2_0_ref:
     parent: influxd generate
diff --git a/content/influxdb/v2.0/reference/cli/influxd/generate/simple.md b/content/influxdb/v2.0/reference/cli/influxd/generate/simple.md
index 677cfce82..943129926 100644
--- a/content/influxdb/v2.0/reference/cli/influxd/generate/simple.md
+++ b/content/influxdb/v2.0/reference/cli/influxd/generate/simple.md
@@ -3,7 +3,7 @@ title: influxd generate simple
 description: >
   The `influxd generate simple` command generates and writes a simple data set using
   reasonable defaults and CLI flags.
-v2.0/tags: [sample-data]
+influxdb/v2.0/tags: [sample-data]
 menu:
   influxdb_2_0_ref:
     parent: influxd generate
diff --git a/content/influxdb/v2.0/reference/cli/influxd/inspect/_index.md b/content/influxdb/v2.0/reference/cli/influxd/inspect/_index.md
index 8ba561503..af806b1a7 100644
--- a/content/influxdb/v2.0/reference/cli/influxd/inspect/_index.md
+++ b/content/influxdb/v2.0/reference/cli/influxd/inspect/_index.md
@@ -1,7 +1,7 @@
 ---
 title: influxd inspect
 description: The `influxd inspect` commands and subcommands inspecting on-disk InfluxDB time series data.
-v2.0/tags: [inspect]
+influxdb/v2.0/tags: [inspect]
 menu:
   influxdb_2_0_ref:
     parent: influxd
diff --git a/content/influxdb/v2.0/reference/cli/influxd/inspect/build-tsi.md b/content/influxdb/v2.0/reference/cli/influxd/inspect/build-tsi.md
index 15ea271d5..bb39d5184 100644
--- a/content/influxdb/v2.0/reference/cli/influxd/inspect/build-tsi.md
+++ b/content/influxdb/v2.0/reference/cli/influxd/inspect/build-tsi.md
@@ -3,7 +3,7 @@ title: influxd inspect build-tsi
 description: >
   The `influxd inspect build-tsi` command rebuilds the TSI index and, if necessary,
   the series file.
-v2.0/tags: [tsi]
+influxdb/v2.0/tags: [tsi]
 menu:
   influxdb_2_0_ref:
     parent: influxd inspect
diff --git a/content/influxdb/v2.0/reference/cli/influxd/inspect/compact-series-file.md b/content/influxdb/v2.0/reference/cli/influxd/inspect/compact-series-file.md
index 6dc26a4c9..1082f64bd 100644
--- a/content/influxdb/v2.0/reference/cli/influxd/inspect/compact-series-file.md
+++ b/content/influxdb/v2.0/reference/cli/influxd/inspect/compact-series-file.md
@@ -3,7 +3,7 @@ title: influxd inspect compact-series-file
 description: >
   The `influxd inspect compact-series-file` command compacts the series file by
   removing deleted series.
-v2.0/tags: [inspect]
+influxdb/v2.0/tags: [inspect]
 menu:
   influxdb_2_0_ref:
     parent: influxd inspect
diff --git a/content/influxdb/v2.0/reference/cli/influxd/inspect/dump-tsi.md b/content/influxdb/v2.0/reference/cli/influxd/inspect/dump-tsi.md
index d5c58221b..6ebc7c46b 100644
--- a/content/influxdb/v2.0/reference/cli/influxd/inspect/dump-tsi.md
+++ b/content/influxdb/v2.0/reference/cli/influxd/inspect/dump-tsi.md
@@ -2,7 +2,7 @@
 title: influxd inspect dump-tsi
 description: >
   The `influxd inspect dump-tsi` command outputs low-level information about `tsi1` files.
-v2.0/tags: [tsi, inspect]
+influxdb/v2.0/tags: [tsi, inspect]
 menu:
   influxdb_2_0_ref:
     parent: influxd inspect
diff --git a/content/influxdb/v2.0/reference/cli/influxd/inspect/dumpwal.md b/content/influxdb/v2.0/reference/cli/influxd/inspect/dumpwal.md
index 6db962b03..061ae62a5 100644
--- a/content/influxdb/v2.0/reference/cli/influxd/inspect/dumpwal.md
+++ b/content/influxdb/v2.0/reference/cli/influxd/inspect/dumpwal.md
@@ -2,7 +2,7 @@
 title: influxd inspect dumpwal
 description: >
   The `influxd inspect dumpwal` command outputs data from WAL files.
-v2.0/tags: [wal, inspect]
+influxdb/v2.0/tags: [wal, inspect]
 menu:
   influxdb_2_0_ref:
     parent: influxd inspect
diff --git a/content/influxdb/v2.0/reference/cli/influxd/inspect/export-blocks.md b/content/influxdb/v2.0/reference/cli/influxd/inspect/export-blocks.md
index d305377b0..782e068a4 100644
--- a/content/influxdb/v2.0/reference/cli/influxd/inspect/export-blocks.md
+++ b/content/influxdb/v2.0/reference/cli/influxd/inspect/export-blocks.md
@@ -3,7 +3,7 @@ title: influxd inspect export-blocks
 description: >
   The `influxd inspect export-blocks` command exports all blocks in one or more
   TSM1 files to another format for easier inspection and debugging.
-v2.0/tags: [inspect]
+influxdb/v2.0/tags: [inspect]
 menu:
   influxdb_2_0_ref:
     parent: influxd inspect
diff --git a/content/influxdb/v2.0/reference/cli/influxd/inspect/export-index.md b/content/influxdb/v2.0/reference/cli/influxd/inspect/export-index.md
index 86166f798..7d5854f1a 100644
--- a/content/influxdb/v2.0/reference/cli/influxd/inspect/export-index.md
+++ b/content/influxdb/v2.0/reference/cli/influxd/inspect/export-index.md
@@ -3,7 +3,7 @@ title: influxd inspect export-index
 description: >
   The `influxd inspect export-index` command exports all series in a TSI index to
   SQL format for inspection and debugging.
-v2.0/tags: [inspect]
+influxdb/v2.0/tags: [inspect]
 menu:
   influxdb_2_0_ref:
     parent: influxd inspect
diff --git a/content/influxdb/v2.0/reference/cli/influxd/inspect/report-tsi.md b/content/influxdb/v2.0/reference/cli/influxd/inspect/report-tsi.md
index 508c8db4a..fd6fd0cc1 100644
--- a/content/influxdb/v2.0/reference/cli/influxd/inspect/report-tsi.md
+++ b/content/influxdb/v2.0/reference/cli/influxd/inspect/report-tsi.md
@@ -3,7 +3,7 @@ title: influxd inspect report-tsi
 description: >
   The `influxd inspect report-tsi` command analyzes Time Series Index (TSI) files
   in a storage directory and reports the cardinality of data stored in the files.
-v2.0/tags: [tsi, cardinality, inspect]
+influxdb/v2.0/tags: [tsi, cardinality, inspect]
 menu:
   influxdb_2_0_ref:
     parent: influxd inspect
diff --git a/content/influxdb/v2.0/reference/cli/influxd/inspect/report-tsm.md b/content/influxdb/v2.0/reference/cli/influxd/inspect/report-tsm.md
index 457b41e55..f13dc8514 100644
--- a/content/influxdb/v2.0/reference/cli/influxd/inspect/report-tsm.md
+++ b/content/influxdb/v2.0/reference/cli/influxd/inspect/report-tsm.md
@@ -4,7 +4,7 @@ description: >
   The `influxd inspect report-tsm` command analyzes Time-Structured Merge Tree (TSM)
   files within a storage engine directory and reports the cardinality within the files
   and the time range the data covers.
-v2.0/tags: [tsm, cardinality, inspect]
+influxdb/v2.0/tags: [tsm, cardinality, inspect]
 menu:
   influxdb_2_0_ref:
     parent: influxd inspect
diff --git a/content/influxdb/v2.0/reference/cli/influxd/inspect/verify-seriesfile.md b/content/influxdb/v2.0/reference/cli/influxd/inspect/verify-seriesfile.md
index e04b82264..cffc96c21 100644
--- a/content/influxdb/v2.0/reference/cli/influxd/inspect/verify-seriesfile.md
+++ b/content/influxdb/v2.0/reference/cli/influxd/inspect/verify-seriesfile.md
@@ -2,7 +2,7 @@
 title: influxd inspect verify-seriesfile
 description: >
   The `influxd inspect verify-seriesfile` command verifies the integrity of series files.
-v2.0/tags: [inspect]
+influxdb/v2.0/tags: [inspect]
 menu:
   influxdb_2_0_ref:
     parent: influxd inspect
diff --git a/content/influxdb/v2.0/reference/cli/influxd/inspect/verify-tsm.md b/content/influxdb/v2.0/reference/cli/influxd/inspect/verify-tsm.md
index 92506bfff..bb25e7396 100644
--- a/content/influxdb/v2.0/reference/cli/influxd/inspect/verify-tsm.md
+++ b/content/influxdb/v2.0/reference/cli/influxd/inspect/verify-tsm.md
@@ -3,7 +3,7 @@ title: influxd inspect verify-tsm
 description: >
   The `influxd inspect verify-tsm` command analyzes a set of TSM files for inconsistencies
   between the TSM index and the blocks.
-v2.0/tags: [tsm, inspect]
+influxdb/v2.0/tags: [tsm, inspect]
 menu:
   influxdb_2_0_ref:
     parent: influxd inspect
diff --git a/content/influxdb/v2.0/reference/cli/influxd/inspect/verify-wal.md b/content/influxdb/v2.0/reference/cli/influxd/inspect/verify-wal.md
index 2e2271e72..95b84b362 100644
--- a/content/influxdb/v2.0/reference/cli/influxd/inspect/verify-wal.md
+++ b/content/influxdb/v2.0/reference/cli/influxd/inspect/verify-wal.md
@@ -3,7 +3,7 @@ title: influxd inspect verify-wal
 description: >
   The `influxd inspect verify-wal` command analyzes the Write-Ahead Log (WAL)
   to check if there are any corrupt files.
-v2.0/tags: [wal, inspect]
+influxdb/v2.0/tags: [wal, inspect]
 menu:
   influxdb_2_0_ref:
     parent: influxd inspect
diff --git a/content/influxdb/v2.0/reference/cli/influxd/restore.md b/content/influxdb/v2.0/reference/cli/influxd/restore.md
index d23c7ba68..d98d8aefd 100644
--- a/content/influxdb/v2.0/reference/cli/influxd/restore.md
+++ b/content/influxdb/v2.0/reference/cli/influxd/restore.md
@@ -1,7 +1,7 @@
 ---
 title: influxd restore
 description: The `influxd restore` command restores backup data and metadata from an InfluxDB backup directory.
-v2.0/tags: [restore]
+influxdb/v2.0/tags: [restore]
 menu:
   influxdb_2_0_ref:
     parent: influxd
diff --git a/content/influxdb/v2.0/reference/cli/influxd/run.md b/content/influxdb/v2.0/reference/cli/influxd/run.md
index 6ef02e502..ad8c25879 100644
--- a/content/influxdb/v2.0/reference/cli/influxd/run.md
+++ b/content/influxdb/v2.0/reference/cli/influxd/run.md
@@ -1,7 +1,7 @@
 ---
 title: influxd run
 description: The `influxd run` command is the default `influxd` command and starts the influxd server.
-v2.0/tags: [influxd, cli]
+influxdb/v2.0/tags: [influxd, cli]
 menu:
   influxdb_2_0_ref:
     parent: influxd
diff --git a/content/influxdb/v2.0/reference/cli/influxd/version.md b/content/influxdb/v2.0/reference/cli/influxd/version.md
index d0c4db181..46f58eb58 100644
--- a/content/influxdb/v2.0/reference/cli/influxd/version.md
+++ b/content/influxdb/v2.0/reference/cli/influxd/version.md
@@ -1,7 +1,7 @@
 ---
 title: influxd version
 description: The `influxd version` command outputs the current version of InfluxDB.
-v2.0/tags: [influxd, cli]
+influxdb/v2.0/tags: [influxd, cli]
 menu:
   influxdb_2_0_ref:
     parent: influxd
diff --git a/content/influxdb/v2.0/reference/flux/_index.md b/content/influxdb/v2.0/reference/flux/_index.md
index 48ef3d580..af96a179f 100644
--- a/content/influxdb/v2.0/reference/flux/_index.md
+++ b/content/influxdb/v2.0/reference/flux/_index.md
@@ -1,7 +1,7 @@
 ---
 title: Flux data scripting language
 description: Reference articles for Flux functions and the Flux language specification.
-v2.0/tags: [flux]
+influxdb/v2.0/tags: [flux]
 menu:
   influxdb_2_0_ref:
     name: Flux language
diff --git a/content/influxdb/v2.0/reference/flux/language/_index.md b/content/influxdb/v2.0/reference/flux/language/_index.md
index bf42bddf5..4818d5c12 100644
--- a/content/influxdb/v2.0/reference/flux/language/_index.md
+++ b/content/influxdb/v2.0/reference/flux/language/_index.md
@@ -8,7 +8,7 @@ menu:
     name: Flux specification
     parent: Flux language
 weight: 103
-v2.0/tags: [flux]
+influxdb/v2.0/tags: [flux]
 ---
 
 The following document specifies the Flux language and query execution.
diff --git a/content/influxdb/v2.0/reference/flux/language/operators.md b/content/influxdb/v2.0/reference/flux/language/operators.md
index c523ce916..e8df9ae0b 100644
--- a/content/influxdb/v2.0/reference/flux/language/operators.md
+++ b/content/influxdb/v2.0/reference/flux/language/operators.md
@@ -6,7 +6,7 @@ menu:
     name: Operators
     parent: Flux specification
 weight: 215
-v2.0/tags: [operators]
+influxdb/v2.0/tags: [operators]
 ---
 
 Flux includes the following types of operators:
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/_index.md b/content/influxdb/v2.0/reference/flux/stdlib/_index.md
index 8d1b055e3..b4cc7a085 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/_index.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/_index.md
@@ -5,7 +5,7 @@ description: >
   that retrieve, transform, process, and output data.
 aliases:
   - /v2.0/reference/flux/functions/
-v2.0/tags: [flux, functions, package]
+influxdb/v2.0/tags: [flux, functions, package]
 menu:
   influxdb_2_0_ref:
     parent: Flux language
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/built-in/_index.md b/content/influxdb/v2.0/reference/flux/stdlib/built-in/_index.md
index e0ff9a297..289f8fae4 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/built-in/_index.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/built-in/_index.md
@@ -11,7 +11,7 @@ menu:
     name: Built-in
     parent: Flux standard library
 weight: 201
-v2.0/tags: [built-in, functions, package]
+influxdb/v2.0/tags: [built-in, functions, package]
 ---
 
 Built-in functions provide a foundation for working with data using Flux.
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/built-in/inputs/_index.md b/content/influxdb/v2.0/reference/flux/stdlib/built-in/inputs/_index.md
index 2591900ff..90dd0b43f 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/built-in/inputs/_index.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/built-in/inputs/_index.md
@@ -11,7 +11,7 @@ menu:
     name: Inputs
     identifier: built-in-inputs
 weight: 301
-v2.0/tags: [inputs, built-in, functions]
+influxdb/v2.0/tags: [inputs, built-in, functions]
 ---
 
 Flux's built-in input functions define sources of data or display information about data sources.
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/built-in/misc/_index.md b/content/influxdb/v2.0/reference/flux/stdlib/built-in/misc/_index.md
index a599bd724..060ed9f27 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/built-in/misc/_index.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/built-in/misc/_index.md
@@ -13,7 +13,7 @@ menu:
     name: Miscellaneous
     identifier: built-in-misc
 weight: 305
-v2.0/tags: [built-in, functions]
+influxdb/v2.0/tags: [built-in, functions]
 ---
 
 Flux's built-in functions primarily retrieve, shape and transform, then output data, however
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/built-in/outputs/_index.md b/content/influxdb/v2.0/reference/flux/stdlib/built-in/outputs/_index.md
index d74fc6efc..822accc42 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/built-in/outputs/_index.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/built-in/outputs/_index.md
@@ -11,7 +11,7 @@ menu:
     name: Outputs
     identifier: built-in-outputs
 weight: 302
-v2.0/tags: [outputs, built-in, functions]
+influxdb/v2.0/tags: [outputs, built-in, functions]
 ---
 
 Flux's built-in output functions yield results or send data to a specified output destination.
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/built-in/tests/_index.md b/content/influxdb/v2.0/reference/flux/stdlib/built-in/tests/_index.md
index 94465ca5f..a8747258c 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/built-in/tests/_index.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/built-in/tests/_index.md
@@ -10,7 +10,7 @@ menu:
     identifier: built-in-tests
     parent: Built-in
 weight: 305
-v2.0/tags: [testing, built-in, functions]
+influxdb/v2.0/tags: [testing, built-in, functions]
 ---
 
 Flux's built-in testing functions test various aspects of piped-forward data.
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/built-in/transformations/_index.md b/content/influxdb/v2.0/reference/flux/stdlib/built-in/transformations/_index.md
index 7a7087f25..6b9b081e6 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/built-in/transformations/_index.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/built-in/transformations/_index.md
@@ -11,7 +11,7 @@ menu:
     name: Transformations
     identifier: built-in-transformations
 weight: 303
-v2.0/tags: [transformations, built-in, functions]
+influxdb/v2.0/tags: [transformations, built-in, functions]
 ---
 
 Flux's built-in transformation functions transform or shape your data in specific ways.
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/built-in/transformations/aggregates/_index.md b/content/influxdb/v2.0/reference/flux/stdlib/built-in/transformations/aggregates/_index.md
index 1b0c97358..a8fbcba9a 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/built-in/transformations/aggregates/_index.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/built-in/transformations/aggregates/_index.md
@@ -13,7 +13,7 @@ menu:
     name: Aggregates
     identifier: built-in-aggregates
 weight: 401
-v2.0/tags: [aggregates, built-in, functions]
+influxdb/v2.0/tags: [aggregates, built-in, functions]
 related:
   - /influxdb/v2.0/query-data/flux/window-aggregate/
 ---
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/built-in/transformations/aggregates/reduce.md b/content/influxdb/v2.0/reference/flux/stdlib/built-in/transformations/aggregates/reduce.md
index b4423230f..a5356053f 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/built-in/transformations/aggregates/reduce.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/built-in/transformations/aggregates/reduce.md
@@ -10,7 +10,7 @@ menu:
     name: reduce
     parent: built-in-aggregates
 weight: 501
-v2.0/tags: [exists]
+influxdb/v2.0/tags: [exists]
 related:
   - /influxdb/v2.0/query-data/flux/custom-functions/custom-aggregate/
   - /influxdb/v2.0/query-data/flux/conditional-logic/
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/built-in/transformations/filter.md b/content/influxdb/v2.0/reference/flux/stdlib/built-in/transformations/filter.md
index bb8a70902..ef1eaef58 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/built-in/transformations/filter.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/built-in/transformations/filter.md
@@ -9,7 +9,7 @@ menu:
     name: filter
     parent: built-in-transformations
 weight: 402
-v2.0/tags: [exists]
+influxdb/v2.0/tags: [exists]
 related:
   - /influxdb/v2.0/query-data/flux/query-fields/
   - /influxdb/v2.0/query-data/flux/conditional-logic/
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/built-in/transformations/map.md b/content/influxdb/v2.0/reference/flux/stdlib/built-in/transformations/map.md
index e53919804..b4ae8e5dd 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/built-in/transformations/map.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/built-in/transformations/map.md
@@ -9,7 +9,7 @@ menu:
     name: map
     parent: built-in-transformations
 weight: 402
-v2.0/tags: [exists]
+influxdb/v2.0/tags: [exists]
 related:
   - /influxdb/v2.0/query-data/flux/conditional-logic/
   - /influxdb/v2.0/query-data/flux/mathematic-operations/
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/built-in/transformations/selectors/_index.md b/content/influxdb/v2.0/reference/flux/stdlib/built-in/transformations/selectors/_index.md
index 981093de7..0e618391f 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/built-in/transformations/selectors/_index.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/built-in/transformations/selectors/_index.md
@@ -11,7 +11,7 @@ menu:
     name: Selectors
     identifier: built-in-selectors
 weight: 401
-v2.0/tags: [selectors, built-in, functions]
+influxdb/v2.0/tags: [selectors, built-in, functions]
 related:
   - /influxdb/v2.0/query-data/flux/window-aggregate/
 ---
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/built-in/transformations/stream-table/_index.md b/content/influxdb/v2.0/reference/flux/stdlib/built-in/transformations/stream-table/_index.md
index 682fdd75a..1227b3a72 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/built-in/transformations/stream-table/_index.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/built-in/transformations/stream-table/_index.md
@@ -12,7 +12,7 @@ menu:
   influxdb_2_0_ref:
     name: Stream & table
     parent: built-in-transformations
-v2.0/tags: [transformations, built-in, functions, stream, table]
+influxdb/v2.0/tags: [transformations, built-in, functions, stream, table]
 related:
   - /influxdb/v2.0/query-data/flux/scalar-values/
 ---
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/built-in/transformations/tripleexponentialderivative.md b/content/influxdb/v2.0/reference/flux/stdlib/built-in/transformations/tripleexponentialderivative.md
index 692a16a02..4bac9835c 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/built-in/transformations/tripleexponentialderivative.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/built-in/transformations/tripleexponentialderivative.md
@@ -11,7 +11,7 @@ menu:
     name: tripleExponentialDerivative
     parent: built-in-transformations
 weight: 402
-v2.0/tags: [technical analysis]
+influxdb/v2.0/tags: [technical analysis]
 related:
   - /v2.0/reference/flux/stdlib/built-in/transformations/movingaverage/
   - /v2.0/reference/flux/stdlib/built-in/transformations/doubleema/
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/built-in/transformations/type-conversions/_index.md b/content/influxdb/v2.0/reference/flux/stdlib/built-in/transformations/type-conversions/_index.md
index 68ceebbdb..9164a84b7 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/built-in/transformations/type-conversions/_index.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/built-in/transformations/type-conversions/_index.md
@@ -11,7 +11,7 @@ menu:
     name: Type conversions
     identifier: built-in-type-conversions
 weight: 401
-v2.0/tags: [type-conversions, built-in, functions]
+influxdb/v2.0/tags: [type-conversions, built-in, functions]
 ---
 
 Flux's built-in type conversion functions convert columns of the input table into a specific data type.
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/contrib/_index.md b/content/influxdb/v2.0/reference/flux/stdlib/contrib/_index.md
index 6c12d0e8a..53a3c2622 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/contrib/_index.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/contrib/_index.md
@@ -8,7 +8,7 @@ menu:
     name: Contributed
     parent: Flux standard library
 weight: 202
-v2.0/tags: [contributed, functions, package]
+influxdb/v2.0/tags: [contributed, functions, package]
 ---
 
 User-contributed packages and functions are contributed and maintained by members of the InfluxDB and Flux communities.
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/contrib/discord/_index.md b/content/influxdb/v2.0/reference/flux/stdlib/contrib/discord/_index.md
index 9dcbcf690..37cb3354d 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/contrib/discord/_index.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/contrib/discord/_index.md
@@ -9,7 +9,7 @@ menu:
     name: Discord
     parent: Contributed
 weight: 202
-v2.0/tags: [functions, discord, package]
+influxdb/v2.0/tags: [functions, discord, package]
 ---
 
 The Flux Discord package provides functions for sending messages to Discord.
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/contrib/teams/_index.md b/content/influxdb/v2.0/reference/flux/stdlib/contrib/teams/_index.md
index be00aace9..f0ea4d7e3 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/contrib/teams/_index.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/contrib/teams/_index.md
@@ -11,7 +11,7 @@ menu:
     name: Teams
     parent: Contributed
 weight: 202
-v2.0/tags: [functions, teams, microsoft, package]
+influxdb/v2.0/tags: [functions, teams, microsoft, package]
 ---
 
 The Flux Microsoft Teams package provides functions for sending messages to a
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/contrib/telegram/_index.md b/content/influxdb/v2.0/reference/flux/stdlib/contrib/telegram/_index.md
index e4e32d0d4..e21d0d838 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/contrib/telegram/_index.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/contrib/telegram/_index.md
@@ -10,7 +10,7 @@ menu:
     name: Telegram
     parent: Contributed
 weight: 202
-v2.0/tags: [functions, teams, microsoft, package]
+influxdb/v2.0/tags: [functions, teams, microsoft, package]
 ---
 
 The Flux Telegram package provides functions for sending messages to
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/csv/_index.md b/content/influxdb/v2.0/reference/flux/stdlib/csv/_index.md
index b07ca2bcb..40266ea4d 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/csv/_index.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/csv/_index.md
@@ -11,7 +11,7 @@ menu:
     name: CSV
     parent: Flux standard library
 weight: 202
-v2.0/tags: [functions, csv, package]
+influxdb/v2.0/tags: [functions, csv, package]
 ---
 
 CSV Flux functions provide tools for working with data in [annotated CSV format](https://github.com/influxdata/flux/blob/master/docs/SPEC.md#csv).
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/date/_index.md b/content/influxdb/v2.0/reference/flux/stdlib/date/_index.md
index 00b377719..7987024a0 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/date/_index.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/date/_index.md
@@ -12,7 +12,7 @@ menu:
     name: Date
     parent: Flux standard library
 weight: 202
-v2.0/tags: [date, time, functions]
+influxdb/v2.0/tags: [date, time, functions]
 ---
 
 The Flux date package provides date and time constants and functions.
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/experimental/_index.md b/content/influxdb/v2.0/reference/flux/stdlib/experimental/_index.md
index c8791ec53..247a2cc49 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/experimental/_index.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/experimental/_index.md
@@ -9,7 +9,7 @@ menu:
     name: Experimental
     parent: Flux standard library
 weight: 202
-v2.0/tags: [functions, experimental, package]
+influxdb/v2.0/tags: [functions, experimental, package]
 ---
 
 The Flux Experimental package includes experimental functions that perform various tasks.
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/experimental/aggregate/_index.md b/content/influxdb/v2.0/reference/flux/stdlib/experimental/aggregate/_index.md
index 55f52c279..aef8c7f11 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/experimental/aggregate/_index.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/experimental/aggregate/_index.md
@@ -9,7 +9,7 @@ menu:
     name: Aggregate
     parent: Experimental
 weight: 301
-v2.0/tags: [package]
+influxdb/v2.0/tags: [package]
 ---
 
 The Flux Aggregate package provides functions to simplify common aggregate operations.
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/experimental/bigtable/_index.md b/content/influxdb/v2.0/reference/flux/stdlib/experimental/bigtable/_index.md
index 9a2317d06..9b0aacf90 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/experimental/bigtable/_index.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/experimental/bigtable/_index.md
@@ -9,7 +9,7 @@ menu:
     name: Bigtable
     parent: Experimental
 weight: 301
-v2.0/tags: [functions, bigtable, package, google]
+influxdb/v2.0/tags: [functions, bigtable, package, google]
 ---
 
 The Flux Bigtable package provides tools for working with data in
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/experimental/csv/_index.md b/content/influxdb/v2.0/reference/flux/stdlib/experimental/csv/_index.md
index 7af5e29aa..d60db70c4 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/experimental/csv/_index.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/experimental/csv/_index.md
@@ -10,7 +10,7 @@ menu:
     identifier: CSV-exp
     parent: Experimental
 weight: 301
-v2.0/tags: [functions, csv, package]
+influxdb/v2.0/tags: [functions, csv, package]
 ---
 
 The Flux Experimental CSV package provides functions for retrieving annotated CSV.
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/experimental/geo/_index.md b/content/influxdb/v2.0/reference/flux/stdlib/experimental/geo/_index.md
index f2c595f02..ea0e4917e 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/experimental/geo/_index.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/experimental/geo/_index.md
@@ -10,7 +10,7 @@ menu:
     name: Geo
     parent: Experimental
 weight: 301
-v2.0/tags: [functions, package, geo]
+influxdb/v2.0/tags: [functions, package, geo]
 related:
   - /influxdb/v2.0/query-data/flux/geo/
 ---
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/experimental/geo/astracks.md b/content/influxdb/v2.0/reference/flux/stdlib/experimental/geo/astracks.md
index 709d33bfc..2f1b4513b 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/experimental/geo/astracks.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/experimental/geo/astracks.md
@@ -7,7 +7,7 @@ menu:
     name: geo.asTracks
     parent: Geo
 weight: 401
-v2.0/tags: [functions, geo]
+influxdb/v2.0/tags: [functions, geo]
 related:
   - /influxdb/v2.0/query-data/flux/geo/
 ---
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/experimental/geo/filterrows.md b/content/influxdb/v2.0/reference/flux/stdlib/experimental/geo/filterrows.md
index 31fdbc906..fec65a920 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/experimental/geo/filterrows.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/experimental/geo/filterrows.md
@@ -8,7 +8,7 @@ menu:
     name: geo.filterRows
     parent: Geo
 weight: 401
-v2.0/tags: [functions, geo]
+influxdb/v2.0/tags: [functions, geo]
 related:
   - /v2.0/reference/flux/stdlib/experimental/geo/gridfilter/
   - /v2.0/reference/flux/stdlib/experimental/geo/strictfilter/
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/experimental/geo/gridfilter.md b/content/influxdb/v2.0/reference/flux/stdlib/experimental/geo/gridfilter.md
index 88d1addf8..f38b342ae 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/experimental/geo/gridfilter.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/experimental/geo/gridfilter.md
@@ -7,7 +7,7 @@ menu:
     name: geo.gridFilter
     parent: Geo
 weight: 401
-v2.0/tags: [functions, geo]
+influxdb/v2.0/tags: [functions, geo]
 related:
   - /v2.0/reference/flux/stdlib/experimental/geo/strictfilter/
   - /v2.0/reference/flux/stdlib/experimental/geo/filterRows/
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/experimental/geo/groupbyarea.md b/content/influxdb/v2.0/reference/flux/stdlib/experimental/geo/groupbyarea.md
index 1bff8e598..73b04bbbd 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/experimental/geo/groupbyarea.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/experimental/geo/groupbyarea.md
@@ -7,7 +7,7 @@ menu:
     name: geo.groupByArea
     parent: Geo
 weight: 401
-v2.0/tags: [functions, geo]
+influxdb/v2.0/tags: [functions, geo]
 related:
   - /influxdb/v2.0/query-data/flux/geo/
 ---
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/experimental/geo/s2cellidtoken.md b/content/influxdb/v2.0/reference/flux/stdlib/experimental/geo/s2cellidtoken.md
index b96b4f99e..7cdf7c693 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/experimental/geo/s2cellidtoken.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/experimental/geo/s2cellidtoken.md
@@ -7,7 +7,7 @@ menu:
     name: geo.s2CellIDToken
     parent: Geo
 weight: 401
-v2.0/tags: [functions, geo]
+influxdb/v2.0/tags: [functions, geo]
 related:
   - /influxdb/v2.0/query-data/flux/geo/
 ---
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/experimental/geo/shapedata.md b/content/influxdb/v2.0/reference/flux/stdlib/experimental/geo/shapedata.md
index bdb6342e3..16c9d7b48 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/experimental/geo/shapedata.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/experimental/geo/shapedata.md
@@ -9,7 +9,7 @@ menu:
     name: geo.shapeData
     parent: Geo
 weight: 401
-v2.0/tags: [functions, geo]
+influxdb/v2.0/tags: [functions, geo]
 related:
   - /influxdb/v2.0/query-data/flux/geo/
 ---
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/experimental/geo/strictfilter.md b/content/influxdb/v2.0/reference/flux/stdlib/experimental/geo/strictfilter.md
index 0d8ec334d..259eadbce 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/experimental/geo/strictfilter.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/experimental/geo/strictfilter.md
@@ -7,7 +7,7 @@ menu:
     name: geo.strictFilter
     parent: Geo
 weight: 401
-v2.0/tags: [functions, geo]
+influxdb/v2.0/tags: [functions, geo]
 related:
   - /v2.0/reference/flux/stdlib/experimental/geo/gridfilter/
   - /v2.0/reference/flux/stdlib/experimental/geo/filterRows/
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/experimental/geo/torows.md b/content/influxdb/v2.0/reference/flux/stdlib/experimental/geo/torows.md
index 68c1e42a6..79434610c 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/experimental/geo/torows.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/experimental/geo/torows.md
@@ -7,7 +7,7 @@ menu:
     name: geo.toRows
     parent: Geo
 weight: 401
-v2.0/tags: [functions, geo]
+influxdb/v2.0/tags: [functions, geo]
 related:
   - /influxdb/v2.0/query-data/flux/geo/
   - /v2.0/reference/flux/stdlib/built-in/transformations/pivot/
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/experimental/http/_index.md b/content/influxdb/v2.0/reference/flux/stdlib/experimental/http/_index.md
index 93202b280..174b10fa7 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/experimental/http/_index.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/experimental/http/_index.md
@@ -11,7 +11,7 @@ menu:
     identifier: HTTP-exp
     parent: Experimental
 weight: 301
-v2.0/tags: [functions, http, package]
+influxdb/v2.0/tags: [functions, http, package]
 ---
 
 The Flux Experimental HTTP package provides functions for transferring data
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/experimental/json/_index.md b/content/influxdb/v2.0/reference/flux/stdlib/experimental/json/_index.md
index 548182582..07b6d06a1 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/experimental/json/_index.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/experimental/json/_index.md
@@ -10,7 +10,7 @@ menu:
     identifier: JSON-exp
     parent: Experimental
 weight: 301
-v2.0/tags: [functions, json, package]
+influxdb/v2.0/tags: [functions, json, package]
 ---
 
 Flux experimental JSON functions provide tools for working with JSON.
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/experimental/mqtt/_index.md b/content/influxdb/v2.0/reference/flux/stdlib/experimental/mqtt/_index.md
index 5cec602e0..7d3b44ddb 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/experimental/mqtt/_index.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/experimental/mqtt/_index.md
@@ -9,7 +9,7 @@ menu:
     name: MQTT
     parent: Experimental
 weight: 301
-v2.0/tags: [functions, mqtt, package]
+influxdb/v2.0/tags: [functions, mqtt, package]
 ---
 
 Flux MQTT functions provide tools for working with Message Queuing Telemetry Transport (MQTT) protocol.
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/experimental/prometheus/_index.md b/content/influxdb/v2.0/reference/flux/stdlib/experimental/prometheus/_index.md
index 0d902299e..2e85785c7 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/experimental/prometheus/_index.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/experimental/prometheus/_index.md
@@ -9,7 +9,7 @@ menu:
     name: Prometheus
     parent: Experimental
 weight: 301
-v2.0/tags: [functions, prometheus, package]
+influxdb/v2.0/tags: [functions, prometheus, package]
 ---
 
 Flux Prometheus functions provide tools for working with
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/experimental/query/_index.md b/content/influxdb/v2.0/reference/flux/stdlib/experimental/query/_index.md
index 4791daed3..2c822bc97 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/experimental/query/_index.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/experimental/query/_index.md
@@ -9,7 +9,7 @@ menu:
     name: Query
     parent: Experimental
 weight: 301
-v2.0/tags: [package]
+influxdb/v2.0/tags: [package]
 ---
 
 Flux Query functions provide functions meant to simplify common InfluxDB queries.
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/http/_index.md b/content/influxdb/v2.0/reference/flux/stdlib/http/_index.md
index c2122c884..9be83297c 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/http/_index.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/http/_index.md
@@ -11,7 +11,7 @@ menu:
     name: HTTP
     parent: Flux standard library
 weight: 202
-v2.0/tags: [functions, http, package]
+influxdb/v2.0/tags: [functions, http, package]
 ---
 
 The Flux HTTP package provides functions for transferring data using the HTTP protocol.
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/http/endpoint.md b/content/influxdb/v2.0/reference/flux/stdlib/http/endpoint.md
index 0c0a70196..a6ca51d56 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/http/endpoint.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/http/endpoint.md
@@ -9,7 +9,7 @@ menu:
     name: http.endpoint
     parent: HTTP
 weight: 202
-v2.0/tags: [endpoints]
+influxdb/v2.0/tags: [endpoints]
 ---
 
 The `http.endpoint()` function sends output data to an HTTP URL using the POST request method.
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/influxdb-v1/_index.md b/content/influxdb/v2.0/reference/flux/stdlib/influxdb-v1/_index.md
index e20557073..adc754979 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/influxdb-v1/_index.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/influxdb-v1/_index.md
@@ -12,7 +12,7 @@ menu:
     name: InfluxDB v1
     parent: Flux standard library
 weight: 202
-v2.0/tags: [functions, influxdb-v1, package]
+influxdb/v2.0/tags: [functions, influxdb-v1, package]
 ---
 
 InfluxDB v1 Flux functions provide tools for managing data from an InfluxDB v1.x
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/influxdb-v1/fieldkeys.md b/content/influxdb/v2.0/reference/flux/stdlib/influxdb-v1/fieldkeys.md
index 89fad0dbc..44cc1616d 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/influxdb-v1/fieldkeys.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/influxdb-v1/fieldkeys.md
@@ -6,7 +6,7 @@ menu:
     name: v1.fieldKeys
     parent: InfluxDB v1
 weight: 301
-v2.0/tags: [fields]
+influxdb/v2.0/tags: [fields]
 related:
   - /influxdb/v2.0/query-data/flux/explore-schema/
   - https://docs.influxdata.com/influxdb/latest/query_language/schema_exploration#show-field-keys, SHOW FIELD KEYS in InfluxQL
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/influxdb-v1/measurementfieldkeys.md b/content/influxdb/v2.0/reference/flux/stdlib/influxdb-v1/measurementfieldkeys.md
index 9b0c38736..eb65e7070 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/influxdb-v1/measurementfieldkeys.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/influxdb-v1/measurementfieldkeys.md
@@ -6,7 +6,7 @@ menu:
     name: v1.measurementFieldKeys
     parent: InfluxDB v1
 weight: 301
-v2.0/tags: [fields]
+influxdb/v2.0/tags: [fields]
 related:
   - /influxdb/v2.0/query-data/flux/explore-schema/
   - https://docs.influxdata.com/influxdb/latest/query_language/schema_exploration#show-field-keys, SHOW FIELD KEYS in InfluxQL
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/influxdb-v1/measurements.md b/content/influxdb/v2.0/reference/flux/stdlib/influxdb-v1/measurements.md
index 867f7cf75..08e674ad8 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/influxdb-v1/measurements.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/influxdb-v1/measurements.md
@@ -8,7 +8,7 @@ menu:
     name: v1.measurements
     parent: InfluxDB v1
 weight: 301
-v2.0/tags: [measurements]
+influxdb/v2.0/tags: [measurements]
 related:
   - /influxdb/v2.0/query-data/flux/explore-schema/
   - https://docs.influxdata.com/influxdb/latest/query_language/schema_exploration#show-measurements, SHOW MEASUREMENTS in InfluxQL
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/influxdb-v1/measurementtagkeys.md b/content/influxdb/v2.0/reference/flux/stdlib/influxdb-v1/measurementtagkeys.md
index 1fcc5fca8..433cdadba 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/influxdb-v1/measurementtagkeys.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/influxdb-v1/measurementtagkeys.md
@@ -8,7 +8,7 @@ menu:
     name: v1.measurementTagKeys
     parent: InfluxDB v1
 weight: 301
-v2.0/tags: [tags]
+influxdb/v2.0/tags: [tags]
 related:
   - /influxdb/v2.0/query-data/flux/explore-schema/
   - https://docs.influxdata.com/influxdb/latest/query_language/schema_exploration#show-tag-keys, SHOW TAG KEYS in InfluxQL
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/influxdb-v1/measurementtagvalues.md b/content/influxdb/v2.0/reference/flux/stdlib/influxdb-v1/measurementtagvalues.md
index d32cdcb65..416a5cec7 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/influxdb-v1/measurementtagvalues.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/influxdb-v1/measurementtagvalues.md
@@ -8,7 +8,7 @@ menu:
     name: v1.measurementTagValues
     parent: InfluxDB v1
 weight: 301
-v2.0/tags: [tags]
+influxdb/v2.0/tags: [tags]
 related:
   - /influxdb/v2.0/query-data/flux/explore-schema/
   - https://docs.influxdata.com/influxdb/latest/query_language/schema_exploration#show-tag-values, SHOW TAG VALUES in InfluxQL
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/influxdb-v1/tagkeys.md b/content/influxdb/v2.0/reference/flux/stdlib/influxdb-v1/tagkeys.md
index 5b31cc419..c1cda5a87 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/influxdb-v1/tagkeys.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/influxdb-v1/tagkeys.md
@@ -8,7 +8,7 @@ menu:
     name: v1.tagKeys
     parent: InfluxDB v1
 weight: 301
-v2.0/tags: [tags]
+influxdb/v2.0/tags: [tags]
 related:
   - /influxdb/v2.0/query-data/flux/explore-schema/
   - https://docs.influxdata.com/influxdb/latest/query_language/schema_exploration#show-tag-keys, SHOW TAG KEYS in InfluxQL
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/influxdb-v1/tagvalues.md b/content/influxdb/v2.0/reference/flux/stdlib/influxdb-v1/tagvalues.md
index 517fbbf66..c499976db 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/influxdb-v1/tagvalues.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/influxdb-v1/tagvalues.md
@@ -8,7 +8,7 @@ menu:
     name: v1.tagValues
     parent: InfluxDB v1
 weight: 301
-v2.0/tags: [tags]
+influxdb/v2.0/tags: [tags]
 related:
   - /influxdb/v2.0/query-data/flux/explore-schema/
   - https://docs.influxdata.com/influxdb/latest/query_language/schema_exploration#show-tag-values, SHOW TAG VALUES in InfluxQL
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/json/_index.md b/content/influxdb/v2.0/reference/flux/stdlib/json/_index.md
index 49cee4d5d..39536b1b2 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/json/_index.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/json/_index.md
@@ -11,7 +11,7 @@ menu:
     name: JSON
     parent: Flux standard library
 weight: 202
-v2.0/tags: [functions, json, package]
+influxdb/v2.0/tags: [functions, json, package]
 ---
 
 JSON Flux functions provide tools for working with JSON.
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/math/_index.md b/content/influxdb/v2.0/reference/flux/stdlib/math/_index.md
index bff12a081..fc33cdb55 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/math/_index.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/math/_index.md
@@ -11,7 +11,7 @@ menu:
     name: Math
     parent: Flux standard library
 weight: 202
-v2.0/tags: [math, functions]
+influxdb/v2.0/tags: [math, functions]
 related:
   - /influxdb/v2.0/query-data/flux/mathematic-operations/
 ---
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/monitor/_index.md b/content/influxdb/v2.0/reference/flux/stdlib/monitor/_index.md
index f75081077..9a17fa895 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/monitor/_index.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/monitor/_index.md
@@ -11,7 +11,7 @@ menu:
     name: InfluxDB Monitor
     parent: Flux standard library
 weight: 202
-v2.0/tags: [functions, monitor, alerts, package]
+influxdb/v2.0/tags: [functions, monitor, alerts, package]
 ---
 
 The Flux monitor package provides tools for monitoring and alerting with InfluxDB.
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/pagerduty/_index.md b/content/influxdb/v2.0/reference/flux/stdlib/pagerduty/_index.md
index 58405dcf6..d34013815 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/pagerduty/_index.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/pagerduty/_index.md
@@ -11,7 +11,7 @@ menu:
     name: PagerDuty
     parent: Flux standard library
 weight: 202
-v2.0/tags: [functions, pagerduty, package]
+influxdb/v2.0/tags: [functions, pagerduty, package]
 ---
 
 The Flux PagerDuty package provides functions for sending data to PagerDuty.
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/pagerduty/endpoint.md b/content/influxdb/v2.0/reference/flux/stdlib/pagerduty/endpoint.md
index bb6cf175e..3379ca3c3 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/pagerduty/endpoint.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/pagerduty/endpoint.md
@@ -9,7 +9,7 @@ menu:
     name: pagerduty.endpoint
     parent: PagerDuty
 weight: 202
-v2.0/tags: [endpoints]
+influxdb/v2.0/tags: [endpoints]
 ---
 
 The `pagerduty.endpoint()` function sends a message to PagerDuty that includes output data.
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/pushbullet/_index.md b/content/influxdb/v2.0/reference/flux/stdlib/pushbullet/_index.md
index 8aebef903..3a2025598 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/pushbullet/_index.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/pushbullet/_index.md
@@ -9,7 +9,7 @@ menu:
     name: Pushbullet
     parent: Flux standard library
 weight: 202
-v2.0/tags: [functions, pushbullet, package]
+influxdb/v2.0/tags: [functions, pushbullet, package]
 ---
 
 The Flux Pushbullet package provides functions for sending data to
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/regexp/_index.md b/content/influxdb/v2.0/reference/flux/stdlib/regexp/_index.md
index aea36edcd..e75fde76f 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/regexp/_index.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/regexp/_index.md
@@ -11,7 +11,7 @@ menu:
     name: Regular expressions
     parent: Flux standard library
 weight: 202
-v2.0/tags: [regex, functions]
+influxdb/v2.0/tags: [regex, functions]
 ---
 
 The Flux regular expressions package includes functions that provide enhanced
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/runtime/_index.md b/content/influxdb/v2.0/reference/flux/stdlib/runtime/_index.md
index 9cd02fe1d..7bd6fd7b9 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/runtime/_index.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/runtime/_index.md
@@ -11,7 +11,7 @@ menu:
     name: Runtime
     parent: Flux standard library
 weight: 202
-v2.0/tags: [runtime, functions, package]
+influxdb/v2.0/tags: [runtime, functions, package]
 ---
 
 The Flux runtime package includes functions that provide information about the
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/secrets/_index.md b/content/influxdb/v2.0/reference/flux/stdlib/secrets/_index.md
index 033a8d7d2..e8b6897bc 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/secrets/_index.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/secrets/_index.md
@@ -11,7 +11,7 @@ menu:
     name: InfluxDB Secrets
     parent: Flux standard library
 weight: 202
-v2.0/tags: [functions, secrets, package]
+influxdb/v2.0/tags: [functions, secrets, package]
 ---
 
 InfluxDB Secrets Flux functions provide tools for working with sensitive secrets managed by InfluxDB.
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/slack/_index.md b/content/influxdb/v2.0/reference/flux/stdlib/slack/_index.md
index 4c1157696..1557e4c79 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/slack/_index.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/slack/_index.md
@@ -11,7 +11,7 @@ menu:
     name: Slack
     parent: Flux standard library
 weight: 202
-v2.0/tags: [functions, slack, package]
+influxdb/v2.0/tags: [functions, slack, package]
 ---
 
 The Flux Slack package provides functions for sending data to Slack.
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/slack/endpoint.md b/content/influxdb/v2.0/reference/flux/stdlib/slack/endpoint.md
index dc68b7510..505a82211 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/slack/endpoint.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/slack/endpoint.md
@@ -9,7 +9,7 @@ menu:
     name: slack.endpoint
     parent: Slack
 weight: 202
-v2.0/tags: [endpoints]
+influxdb/v2.0/tags: [endpoints]
 ---
 
 The `slack.endpoint()` function sends a message to Slack that includes output data.
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/sql/_index.md b/content/influxdb/v2.0/reference/flux/stdlib/sql/_index.md
index 8cf05e637..8c0e65def 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/sql/_index.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/sql/_index.md
@@ -12,7 +12,7 @@ menu:
     name: SQL
     parent: Flux standard library
 weight: 202
-v2.0/tags: [functions, sql, package, mysql, postgres]
+influxdb/v2.0/tags: [functions, sql, package, mysql, postgres]
 related:
   - /influxdb/v2.0/query-data/flux/sql/
 ---
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/strings/_index.md b/content/influxdb/v2.0/reference/flux/stdlib/strings/_index.md
index 3f06665fb..7cc3d5c78 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/strings/_index.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/strings/_index.md
@@ -11,7 +11,7 @@ menu:
     name: Strings
     parent: Flux standard library
 weight: 202
-v2.0/tags: [strings, functions, package]
+influxdb/v2.0/tags: [strings, functions, package]
 ---
 
 The Flux string package provides functions to manipulate UTF-8 encoded strings.
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/system/_index.md b/content/influxdb/v2.0/reference/flux/stdlib/system/_index.md
index ab2b0fd82..0b529abbd 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/system/_index.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/system/_index.md
@@ -11,7 +11,7 @@ menu:
     name: System
     parent: Flux standard library
 weight: 202
-v2.0/tags: [system, functions, package]
+influxdb/v2.0/tags: [system, functions, package]
 ---
 
 The Flux system package provides functions for reading values from the system.
diff --git a/content/influxdb/v2.0/reference/flux/stdlib/testing/_index.md b/content/influxdb/v2.0/reference/flux/stdlib/testing/_index.md
index ae52872c5..cd3b9fa5a 100644
--- a/content/influxdb/v2.0/reference/flux/stdlib/testing/_index.md
+++ b/content/influxdb/v2.0/reference/flux/stdlib/testing/_index.md
@@ -11,7 +11,7 @@ menu:
     name: Testing
     parent: Flux standard library
 weight: 202
-v2.0/tags: [testing, functions, package]
+influxdb/v2.0/tags: [testing, functions, package]
 ---
 
 Flux testing functions test piped-forward data in specific ways and return errors if the tests fail.
diff --git a/content/influxdb/v2.0/reference/glossary.md b/content/influxdb/v2.0/reference/glossary.md
index fcc4ff3ad..0c94ef20b 100644
--- a/content/influxdb/v2.0/reference/glossary.md
+++ b/content/influxdb/v2.0/reference/glossary.md
@@ -8,7 +8,7 @@ aliases:
 menu:
   influxdb_2_0_ref:
     name: Glossary
-v2.0/tags: [glossary]
+influxdb/v2.0/tags: [glossary]
 ---
 
 [A](#a) | [B](#b) | [C](#c) | [D](#d) | [E](#e) | [F](#f) | [G](#g) | [H](#h) | [I](#i) | [J](#j) | [K](#k) | [L](#l) | [M](#m) | [N](#n) | [O](#o) | [P](#p) | [Q](#q) | [R](#r) | [S](#s) | [T](#t) | [U](#u) | [V](#v) | [W](#w) | <span style="opacity:.35;font-weight:500">X</span> | <span style="opacity:.35;font-weight:500">Y</span> | <span style="opacity:.35;font-weight:500">Z</span>
diff --git a/content/influxdb/v2.0/reference/internals/storage-engine.md b/content/influxdb/v2.0/reference/internals/storage-engine.md
index f60071359..8057e2071 100644
--- a/content/influxdb/v2.0/reference/internals/storage-engine.md
+++ b/content/influxdb/v2.0/reference/internals/storage-engine.md
@@ -9,7 +9,7 @@ menu:
   influxdb_2_0_ref:
     name: Storage engine
     parent: InfluxDB Internals
-v2.0/tags: [storage, internals]
+influxdb/v2.0/tags: [storage, internals]
 ---
 
 The InfluxDB storage engine ensures that:
diff --git a/content/influxdb/v2.0/reference/key-concepts/_index.md b/content/influxdb/v2.0/reference/key-concepts/_index.md
index ff907e46e..e9d95b908 100644
--- a/content/influxdb/v2.0/reference/key-concepts/_index.md
+++ b/content/influxdb/v2.0/reference/key-concepts/_index.md
@@ -8,7 +8,7 @@ aliases:
 menu:
   influxdb_2_0_ref:
     name: Key concepts
-v2.0/tags: [key concepts]
+influxdb/v2.0/tags: [key concepts]
 ---
 
 Before working with InfluxDB 2.0, it's helpful to learn a few key concepts. Browse the topics below to learn more.
diff --git a/content/influxdb/v2.0/reference/key-concepts/data-elements.md b/content/influxdb/v2.0/reference/key-concepts/data-elements.md
index 22810d581..ab96c9acf 100644
--- a/content/influxdb/v2.0/reference/key-concepts/data-elements.md
+++ b/content/influxdb/v2.0/reference/key-concepts/data-elements.md
@@ -9,7 +9,7 @@ menu:
   influxdb_2_0_ref:
     parent: Key concepts
     name: Data elements
-v2.0/tags: [key concepts, schema]
+influxdb/v2.0/tags: [key concepts, schema]
 ---
 
 InfluxDB 2.0 includes the following data elements:
diff --git a/content/influxdb/v2.0/reference/key-concepts/data-schema.md b/content/influxdb/v2.0/reference/key-concepts/data-schema.md
index 231959954..593f2b4b5 100644
--- a/content/influxdb/v2.0/reference/key-concepts/data-schema.md
+++ b/content/influxdb/v2.0/reference/key-concepts/data-schema.md
@@ -10,7 +10,7 @@ menu:
   influxdb_2_0_ref:
     parent: Key concepts
     name: Data schema
-v2.0/tags: [key concepts]
+influxdb/v2.0/tags: [key concepts]
 ---
 
 InfluxDB [data elements](/v2.0/reference/key-concepts/data-elements/) are stored in [time-structured merge tree (TSM)](/v2.0/reference/internals/storage-engine/#time-structured-merge-tree-tsm) and [time series index (TSI)](/v2.0/reference/internals/storage-engine/#time-series-index-tsi) files to efficiently compact stored data.
diff --git a/content/influxdb/v2.0/reference/key-concepts/design-principles.md b/content/influxdb/v2.0/reference/key-concepts/design-principles.md
index f202f429e..1b26ad10c 100644
--- a/content/influxdb/v2.0/reference/key-concepts/design-principles.md
+++ b/content/influxdb/v2.0/reference/key-concepts/design-principles.md
@@ -9,7 +9,7 @@ menu:
   influxdb_2_0_ref:
     parent: Key concepts
     name: Design principles
-v2.0/tags: [key concepts, design principles]
+influxdb/v2.0/tags: [key concepts, design principles]
 ---
 
 InfluxDB implements optimal design principles for time series data. Some of these design principles may have associated tradeoffs in performance.
diff --git a/content/influxdb/v2.0/reference/syntax/_index.md b/content/influxdb/v2.0/reference/syntax/_index.md
index c15c511ec..9bfba8468 100644
--- a/content/influxdb/v2.0/reference/syntax/_index.md
+++ b/content/influxdb/v2.0/reference/syntax/_index.md
@@ -9,7 +9,7 @@ aliases:
 menu:
   influxdb_2_0_ref:
     name: Syntax
-v2.0/tags: [syntax]
+influxdb/v2.0/tags: [syntax]
 ---
 
 InfluxDB uses a handful of languages and syntaxes to perform tasks such as
diff --git a/content/influxdb/v2.0/reference/syntax/annotated-csv/_index.md b/content/influxdb/v2.0/reference/syntax/annotated-csv/_index.md
index 227c0c878..0f10a6ac8 100644
--- a/content/influxdb/v2.0/reference/syntax/annotated-csv/_index.md
+++ b/content/influxdb/v2.0/reference/syntax/annotated-csv/_index.md
@@ -8,7 +8,7 @@ weight: 103
 menu:
   influxdb_2_0_ref:
     parent: Syntax
-v2.0/tags: [csv, syntax]
+influxdb/v2.0/tags: [csv, syntax]
 aliases:
   - /v2.0/reference/annotated-csv/
 related:
diff --git a/content/influxdb/v2.0/reference/syntax/annotated-csv/extended.md b/content/influxdb/v2.0/reference/syntax/annotated-csv/extended.md
index 9128047f0..e52a8ba9a 100644
--- a/content/influxdb/v2.0/reference/syntax/annotated-csv/extended.md
+++ b/content/influxdb/v2.0/reference/syntax/annotated-csv/extended.md
@@ -9,7 +9,7 @@ menu:
     name: Extended annotated CSV
     parent: Annotated CSV
 weight: 201
-v2.0/tags: [csv, syntax, write]
+influxdb/v2.0/tags: [csv, syntax, write]
 related:
   - /influxdb/v2.0/write-data/csv/
   - /influxdb/v2.0/reference/cli/influx/write/
diff --git a/content/influxdb/v2.0/reference/syntax/delete-predicate.md b/content/influxdb/v2.0/reference/syntax/delete-predicate.md
index 20eed0a39..afe080dfd 100644
--- a/content/influxdb/v2.0/reference/syntax/delete-predicate.md
+++ b/content/influxdb/v2.0/reference/syntax/delete-predicate.md
@@ -11,7 +11,7 @@ menu:
 weight: 104
 aliases:
   - /v2.0/reference/release-notes/syntax/delete-predicate/
-v2.0/tags: [syntax, delete]
+influxdb/v2.0/tags: [syntax, delete]
 related:
   - /influxdb/v2.0/reference/cli/influx/delete/
 ---
diff --git a/content/influxdb/v2.0/reference/syntax/flux.md b/content/influxdb/v2.0/reference/syntax/flux.md
index 0d6372ef7..8b787d632 100644
--- a/content/influxdb/v2.0/reference/syntax/flux.md
+++ b/content/influxdb/v2.0/reference/syntax/flux.md
@@ -11,7 +11,7 @@ menu:
 weight: 101
 aliases:
   - /v2.0/reference/release-notes/syntax/flux/
-v2.0/tags: [syntax, flux]
+influxdb/v2.0/tags: [syntax, flux]
 ---
 
 Flux is a functional data scripting language designed for querying, analyzing, and acting on data.
diff --git a/content/influxdb/v2.0/reference/syntax/line-protocol.md b/content/influxdb/v2.0/reference/syntax/line-protocol.md
index 45303ba66..8c0a41900 100644
--- a/content/influxdb/v2.0/reference/syntax/line-protocol.md
+++ b/content/influxdb/v2.0/reference/syntax/line-protocol.md
@@ -7,7 +7,7 @@ menu:
   influxdb_2_0_ref:
     parent: Syntax
 weight: 102
-v2.0/tags: [write, line protocol, syntax]
+influxdb/v2.0/tags: [write, line protocol, syntax]
 aliases:
   - /v2.0/reference/line-protocol
   - /v2.0/reference/syntax/line-protocol/
diff --git a/content/influxdb/v2.0/security/_index.md b/content/influxdb/v2.0/security/_index.md
index 7ff701f0c..59bb6d422 100644
--- a/content/influxdb/v2.0/security/_index.md
+++ b/content/influxdb/v2.0/security/_index.md
@@ -10,7 +10,7 @@ aliases:
 menu:
   influxdb_2_0:
     name: Security & authorization
-v2.0/tags: [security, authentication]
+influxdb/v2.0/tags: [security, authentication]
 ---
 
 Security, access control, and sensitive secret handling are incredibly important
diff --git a/content/influxdb/v2.0/security/enable-tls.md b/content/influxdb/v2.0/security/enable-tls.md
index 4416e7d0d..7dfff085e 100644
--- a/content/influxdb/v2.0/security/enable-tls.md
+++ b/content/influxdb/v2.0/security/enable-tls.md
@@ -9,7 +9,7 @@ aliases:
 menu:
   influxdb_2_0:
     parent: Security & authorization
-v2.0/tags: [security, authentication, tls, https, ssl]
+influxdb/v2.0/tags: [security, authentication, tls, https, ssl]
 products: [oss]
 ---
 
diff --git a/content/influxdb/v2.0/security/secrets/_index.md b/content/influxdb/v2.0/security/secrets/_index.md
index 4f0490d22..b1ebf4c45 100644
--- a/content/influxdb/v2.0/security/secrets/_index.md
+++ b/content/influxdb/v2.0/security/secrets/_index.md
@@ -1,7 +1,7 @@
 ---
 title: Store and use secrets
 description: Use BoltDB or Vault to store secrets for InfluxDB.
-v2.0/tags: [secrets, security]
+influxdb/v2.0/tags: [secrets, security]
 menu:
   influxdb_2_0:
     parent: Security & authorization
diff --git a/content/influxdb/v2.0/security/secrets/manage-secrets/_index.md b/content/influxdb/v2.0/security/secrets/manage-secrets/_index.md
index e00206500..e0c2feedd 100644
--- a/content/influxdb/v2.0/security/secrets/manage-secrets/_index.md
+++ b/content/influxdb/v2.0/security/secrets/manage-secrets/_index.md
@@ -1,7 +1,7 @@
 ---
 title: Manage secrets
 description: Manage secrets in InfluxDB with the InfluxDB API.
-v2.0/tags: [secrets, security]
+influxdb/v2.0/tags: [secrets, security]
 menu:
   influxdb_2_0:
     parent: Store and use secrets
diff --git a/content/influxdb/v2.0/security/secrets/manage-secrets/add.md b/content/influxdb/v2.0/security/secrets/manage-secrets/add.md
index 0c8a559f6..fb941d58d 100644
--- a/content/influxdb/v2.0/security/secrets/manage-secrets/add.md
+++ b/content/influxdb/v2.0/security/secrets/manage-secrets/add.md
@@ -1,7 +1,7 @@
 ---
 title: Add secrets
 description: Add secrets using the `influx` CLI or the InfluxDB API.
-v2.0/tags: [secrets, security]
+influxdb/v2.0/tags: [secrets, security]
 menu:
   influxdb_2_0:
     parent: Manage secrets
diff --git a/content/influxdb/v2.0/security/secrets/manage-secrets/delete.md b/content/influxdb/v2.0/security/secrets/manage-secrets/delete.md
index 60dc44574..1ee098abd 100644
--- a/content/influxdb/v2.0/security/secrets/manage-secrets/delete.md
+++ b/content/influxdb/v2.0/security/secrets/manage-secrets/delete.md
@@ -1,7 +1,7 @@
 ---
 title: Delete secrets
 description: Delete secrets using the `influx` CLI or the InfluxDB API.
-v2.0/tags: [secrets, security]
+influxdb/v2.0/tags: [secrets, security]
 menu:
   influxdb_2_0:
     parent: Manage secrets
diff --git a/content/influxdb/v2.0/security/secrets/manage-secrets/update.md b/content/influxdb/v2.0/security/secrets/manage-secrets/update.md
index 1024371a3..c0727bca0 100644
--- a/content/influxdb/v2.0/security/secrets/manage-secrets/update.md
+++ b/content/influxdb/v2.0/security/secrets/manage-secrets/update.md
@@ -1,7 +1,7 @@
 ---
 title: Update secrets
 description: Update secrets using the `influx` CLI or the InfluxDB API.
-v2.0/tags: [secrets, security]
+influxdb/v2.0/tags: [secrets, security]
 menu:
   influxdb_2_0:
     parent: Manage secrets
diff --git a/content/influxdb/v2.0/security/secrets/manage-secrets/view.md b/content/influxdb/v2.0/security/secrets/manage-secrets/view.md
index 6f4fe75b0..2010032f4 100644
--- a/content/influxdb/v2.0/security/secrets/manage-secrets/view.md
+++ b/content/influxdb/v2.0/security/secrets/manage-secrets/view.md
@@ -1,7 +1,7 @@
 ---
 title: View secret keys
 description: View secret keys using the `influx` CLI or the InfluxDB API.
-v2.0/tags: [secrets, security]
+influxdb/v2.0/tags: [secrets, security]
 menu:
   influxdb_2_0:
     parent: Manage secrets
diff --git a/content/influxdb/v2.0/security/secrets/use-vault.md b/content/influxdb/v2.0/security/secrets/use-vault.md
index dce6d12c8..c663a34bd 100644
--- a/content/influxdb/v2.0/security/secrets/use-vault.md
+++ b/content/influxdb/v2.0/security/secrets/use-vault.md
@@ -1,7 +1,7 @@
 ---
 title: Store secrets in Vault
 description: Use Vault as an InfluxDB secret store and manage secrets through the in InfluxDB API.
-v2.0/tags: [secrets, security]
+influxdb/v2.0/tags: [secrets, security]
 menu:
   influxdb_2_0:
     parent: Store and use secrets
diff --git a/content/influxdb/v2.0/security/tokens/_index.md b/content/influxdb/v2.0/security/tokens/_index.md
index 8b3280e6d..f32c57c6a 100644
--- a/content/influxdb/v2.0/security/tokens/_index.md
+++ b/content/influxdb/v2.0/security/tokens/_index.md
@@ -5,7 +5,7 @@ description: Manage authentication tokens in InfluxDB using the InfluxDB UI or t
 aliases:
   - /v2.0/users/tokens
   - /v2.0/security/tokens/
-v2.0/tags: [tokens, authentication, security]
+influxdb/v2.0/tags: [tokens, authentication, security]
 menu:
   influxdb_2_0:
     name: Manage tokens
diff --git a/content/influxdb/v2.0/telegraf-configs/_index.md b/content/influxdb/v2.0/telegraf-configs/_index.md
index e469b47f4..557d02823 100644
--- a/content/influxdb/v2.0/telegraf-configs/_index.md
+++ b/content/influxdb/v2.0/telegraf-configs/_index.md
@@ -4,7 +4,7 @@ description: >
   placeholder
 weight: 12
 menu: influxdb_2_0
-v2.0/tags: [telegraf]
+influxdb/v2.0/tags: [telegraf]
 aliases:
   - /v2.0/telegraf-configs/
 related:
diff --git a/content/influxdb/v2.0/users/_index.md b/content/influxdb/v2.0/users/_index.md
index 992529426..9e64abc2d 100644
--- a/content/influxdb/v2.0/users/_index.md
+++ b/content/influxdb/v2.0/users/_index.md
@@ -2,7 +2,7 @@
 title: Manage users
 seotitle: Manage users in InfluxDB
 description: Manage users in InfluxDB using the InfluxDB UI or the influx CLI.
-v2.0/tags: [users, authentication]
+influxdb/v2.0/tags: [users, authentication]
 menu:
   influxdb_2_0:
     name: Manage users
diff --git a/content/influxdb/v2.0/visualize-data/_index.md b/content/influxdb/v2.0/visualize-data/_index.md
index 3e4c953e3..f32b0b5ef 100644
--- a/content/influxdb/v2.0/visualize-data/_index.md
+++ b/content/influxdb/v2.0/visualize-data/_index.md
@@ -3,7 +3,7 @@ title: Visualize data with the InfluxDB UI
 description: >
   InfluxDB offers a complete dashboard solution for visualizing your time series data.
   Create custom dashboards with flexible queries and visualization types.
-v2.0/tags: [visualize]
+influxdb/v2.0/tags: [visualize]
 menu:
   influxdb_2_0:
     name: Visualize data
diff --git a/content/influxdb/v2.0/visualize-data/dashboards/_index.md b/content/influxdb/v2.0/visualize-data/dashboards/_index.md
index 4960267da..521e77e23 100644
--- a/content/influxdb/v2.0/visualize-data/dashboards/_index.md
+++ b/content/influxdb/v2.0/visualize-data/dashboards/_index.md
@@ -1,7 +1,7 @@
 ---
 title: Manage InfluxDB dashboards
 description: Create, edit, and manage custom dashboards in the InfluxDB user interface (UI).
-v2.0/tags: [dashboards]
+influxdb/v2.0/tags: [dashboards]
 menu:
   influxdb_2_0:
     name: Manage dashboards
diff --git a/content/influxdb/v2.0/visualize-data/dashboards/control-dashboard.md b/content/influxdb/v2.0/visualize-data/dashboards/control-dashboard.md
index 738856f40..13cd138a6 100644
--- a/content/influxdb/v2.0/visualize-data/dashboards/control-dashboard.md
+++ b/content/influxdb/v2.0/visualize-data/dashboards/control-dashboard.md
@@ -2,7 +2,7 @@
 title: Control a dashboard
 seotitle: Control an InfluxDB dashboard
 description: Control an InfluxDB dashboard in the InfluxDB user interface (UI).
-v2.0/tags: [dashboards]
+influxdb/v2.0/tags: [dashboards]
 menu:
   influxdb_2_0:
     name: Control a dashboard
diff --git a/content/influxdb/v2.0/visualize-data/dashboards/create-dashboard.md b/content/influxdb/v2.0/visualize-data/dashboards/create-dashboard.md
index 1aa4f2593..e3e5ccff7 100644
--- a/content/influxdb/v2.0/visualize-data/dashboards/create-dashboard.md
+++ b/content/influxdb/v2.0/visualize-data/dashboards/create-dashboard.md
@@ -4,7 +4,7 @@ seotitle: Create an InfluxDB dashboard
 description: >
   Create a new dashboard or import an existing dashboard in the
   InfluxDB user interface (UI).
-v2.0/tags: [dashboards]
+influxdb/v2.0/tags: [dashboards]
 menu:
   influxdb_2_0:
     name: Create a dashboard
diff --git a/content/influxdb/v2.0/visualize-data/dashboards/delete-dashboard.md b/content/influxdb/v2.0/visualize-data/dashboards/delete-dashboard.md
index 31c5fdab5..28222a826 100644
--- a/content/influxdb/v2.0/visualize-data/dashboards/delete-dashboard.md
+++ b/content/influxdb/v2.0/visualize-data/dashboards/delete-dashboard.md
@@ -2,7 +2,7 @@
 title: Delete a dashboard
 seotitle: Delete an InfluxDB dashboard
 description: Delete a dashboard from the InfluxDB user interface (UI).
-v2.0/tags: [dashboards]
+influxdb/v2.0/tags: [dashboards]
 menu:
   influxdb_2_0:
     parent: Manage dashboards
diff --git a/content/influxdb/v2.0/visualize-data/dashboards/export-dashboard.md b/content/influxdb/v2.0/visualize-data/dashboards/export-dashboard.md
index 688534b1b..8caac44bb 100644
--- a/content/influxdb/v2.0/visualize-data/dashboards/export-dashboard.md
+++ b/content/influxdb/v2.0/visualize-data/dashboards/export-dashboard.md
@@ -3,7 +3,7 @@ title: Export a dashboard
 seotitle: Export an InfluxDB dashboard
 description: >
   Export a dashboard using the InfluxDB user interface (UI).
-v2.0/tags: [dashboards]
+influxdb/v2.0/tags: [dashboards]
 menu:
   influxdb_2_0:
     name: Export a dashboard
diff --git a/content/influxdb/v2.0/visualize-data/labels.md b/content/influxdb/v2.0/visualize-data/labels.md
index 46ad54dfe..fbb19e080 100644
--- a/content/influxdb/v2.0/visualize-data/labels.md
+++ b/content/influxdb/v2.0/visualize-data/labels.md
@@ -3,7 +3,7 @@ title: Manage labels in the InfluxDB UI
 description: >
   Labels are a way to add visual metadata to dashboards, tasks, and other items
   in the InfluxDB UI. View and manage labels in the InfluxDB user interface.
-v2.0/tags: [labels]
+influxdb/v2.0/tags: [labels]
 menu:
   influxdb_2_0:
     name: Manage labels
diff --git a/content/influxdb/v2.0/visualize-data/other-tools/grafana.md b/content/influxdb/v2.0/visualize-data/other-tools/grafana.md
index 48ce687d7..4e1760ab4 100644
--- a/content/influxdb/v2.0/visualize-data/other-tools/grafana.md
+++ b/content/influxdb/v2.0/visualize-data/other-tools/grafana.md
@@ -9,7 +9,7 @@ menu:
 weight: 201
 aliases:
   - /v2.0/visualize-data/other-tools/grafana/
-v2.0/tags: [grafana]
+influxdb/v2.0/tags: [grafana]
 related:
   - https://grafana.com/docs/, Grafana documentation
   - /influxdb/v2.0/query-data/get-started/
diff --git a/content/influxdb/v2.0/visualize-data/templates/_index.md b/content/influxdb/v2.0/visualize-data/templates/_index.md
index 51c5d1775..36221dd1a 100644
--- a/content/influxdb/v2.0/visualize-data/templates/_index.md
+++ b/content/influxdb/v2.0/visualize-data/templates/_index.md
@@ -1,7 +1,7 @@
 ---
 title: Manage InfluxDB dashboard templates
 description: Create, edit, and manage dashboard templates in the InfluxDB user interface (UI).
-v2.0/tags: [templates]
+influxdb/v2.0/tags: [templates]
 menu:
   influxdb_2_0:
     name: Manage dashboard templates
diff --git a/content/influxdb/v2.0/visualize-data/templates/create-template.md b/content/influxdb/v2.0/visualize-data/templates/create-template.md
index b240d8ad5..484c0b729 100644
--- a/content/influxdb/v2.0/visualize-data/templates/create-template.md
+++ b/content/influxdb/v2.0/visualize-data/templates/create-template.md
@@ -2,7 +2,7 @@
 title: Create a template
 seotitle: Create an InfluxDB dashboard template
 description: Create an InfluxDB dashboard template in the InfluxDB user interface (UI).
-v2.0/tags: [templates]
+influxdb/v2.0/tags: [templates]
 menu:
   influxdb_2_0:
     name: Create a template
diff --git a/content/influxdb/v2.0/visualize-data/templates/delete-template.md b/content/influxdb/v2.0/visualize-data/templates/delete-template.md
index 29489ac54..1bba0b3b6 100644
--- a/content/influxdb/v2.0/visualize-data/templates/delete-template.md
+++ b/content/influxdb/v2.0/visualize-data/templates/delete-template.md
@@ -2,7 +2,7 @@
 title: Delete a dashboard template
 seotitle: Delete InfluxDB templates
 description: Delete templates in the InfluxDB user interface (UI).
-v2.0/tags: [templates]
+influxdb/v2.0/tags: [templates]
 menu:
   influxdb_2_0:
     name: Delete a template
diff --git a/content/influxdb/v2.0/visualize-data/templates/use-template.md b/content/influxdb/v2.0/visualize-data/templates/use-template.md
index 0ce3b9a4c..d03f172a7 100644
--- a/content/influxdb/v2.0/visualize-data/templates/use-template.md
+++ b/content/influxdb/v2.0/visualize-data/templates/use-template.md
@@ -3,7 +3,7 @@ title: Use a template
 seotitle: Use an InfluxDB dashboard template
 description: >
   Use an InfluxDB dashboard template to create a new InfluxDB dashboard.
-v2.0/tags: [templates]
+influxdb/v2.0/tags: [templates]
 menu:
   influxdb_2_0:
     parent: Manage dashboard templates
diff --git a/content/influxdb/v2.0/visualize-data/templates/view-template.md b/content/influxdb/v2.0/visualize-data/templates/view-template.md
index 9c90acacc..d757959e3 100644
--- a/content/influxdb/v2.0/visualize-data/templates/view-template.md
+++ b/content/influxdb/v2.0/visualize-data/templates/view-template.md
@@ -2,7 +2,7 @@
 title: View templates
 seotitle: View InfluxDB templates
 description: View templates in the InfluxDB user interface (UI).
-v2.0/tags: [templates]
+influxdb/v2.0/tags: [templates]
 menu:
   influxdb_2_0:
     name: View templates
diff --git a/content/influxdb/v2.0/visualize-data/variables/_index.md b/content/influxdb/v2.0/visualize-data/variables/_index.md
index fd7bc8944..2b646b877 100644
--- a/content/influxdb/v2.0/visualize-data/variables/_index.md
+++ b/content/influxdb/v2.0/visualize-data/variables/_index.md
@@ -10,7 +10,7 @@ menu:
 weight: 103
 aliases:
   - /v2.0/visualize-data/variables/
-v2.0/tags: [variables]
+influxdb/v2.0/tags: [variables]
 ---
 
 Dashboard variables let you alter specific components of cells' queries without having to edit the queries,
diff --git a/content/influxdb/v2.0/visualize-data/variables/common-variables.md b/content/influxdb/v2.0/visualize-data/variables/common-variables.md
index 2d02e81e4..f1ad24a01 100644
--- a/content/influxdb/v2.0/visualize-data/variables/common-variables.md
+++ b/content/influxdb/v2.0/visualize-data/variables/common-variables.md
@@ -8,7 +8,7 @@ menu:
 weight: 208
 aliases:
   - /v2.0/visualize-data/variables/common-variables/
-v2.0/tags: [variables]
+influxdb/v2.0/tags: [variables]
 ---
 
 ## List buckets
diff --git a/content/influxdb/v2.0/visualize-data/variables/create-variable.md b/content/influxdb/v2.0/visualize-data/variables/create-variable.md
index b6542ca55..6d2d81653 100644
--- a/content/influxdb/v2.0/visualize-data/variables/create-variable.md
+++ b/content/influxdb/v2.0/visualize-data/variables/create-variable.md
@@ -8,7 +8,7 @@ menu:
 weight: 201
 aliases:
   - /v2.0/visualize-data/variables/create-variable/
-v2.0/tags: [variables]
+influxdb/v2.0/tags: [variables]
 ---
 
 Create dashboard variables in the Data Explorer, from the Settings section, or import a variable.
diff --git a/content/influxdb/v2.0/visualize-data/variables/delete-variable.md b/content/influxdb/v2.0/visualize-data/variables/delete-variable.md
index d2b5b6ce2..dd28edc0a 100644
--- a/content/influxdb/v2.0/visualize-data/variables/delete-variable.md
+++ b/content/influxdb/v2.0/visualize-data/variables/delete-variable.md
@@ -8,7 +8,7 @@ menu:
 weight: 205
 aliases:
   - /v2.0/visualize-data/variables/delete-variable/
-v2.0/tags: [variables]
+influxdb/v2.0/tags: [variables]
 ---
 
 Delete an existing variable in the InfluxDB user interface (UI).
diff --git a/content/influxdb/v2.0/visualize-data/variables/export-variable.md b/content/influxdb/v2.0/visualize-data/variables/export-variable.md
index 170a0b4e7..df028806c 100644
--- a/content/influxdb/v2.0/visualize-data/variables/export-variable.md
+++ b/content/influxdb/v2.0/visualize-data/variables/export-variable.md
@@ -8,7 +8,7 @@ menu:
 weight: 204
 aliases:
   - /v2.0/visualize-data/variables/export-variable/
-v2.0/tags: [variables]
+influxdb/v2.0/tags: [variables]
 ---
 Export dashboard variables from the InfluxDB user interface (UI).
 Variables are exported as downloadable JSON files.
diff --git a/content/influxdb/v2.0/visualize-data/variables/update-variable.md b/content/influxdb/v2.0/visualize-data/variables/update-variable.md
index 989b8512f..e9519bc45 100644
--- a/content/influxdb/v2.0/visualize-data/variables/update-variable.md
+++ b/content/influxdb/v2.0/visualize-data/variables/update-variable.md
@@ -8,7 +8,7 @@ menu:
 weight: 203
 aliases:
   - /v2.0/visualize-data/variables/update-variable/
-v2.0/tags: [variables]
+influxdb/v2.0/tags: [variables]
 ---
 
 Update an existing dashboard variable's name or JSON content in the InfluxDB user interface (UI).
diff --git a/content/influxdb/v2.0/visualize-data/variables/variable-types.md b/content/influxdb/v2.0/visualize-data/variables/variable-types.md
index a0bd58ee5..9edfbb679 100644
--- a/content/influxdb/v2.0/visualize-data/variables/variable-types.md
+++ b/content/influxdb/v2.0/visualize-data/variables/variable-types.md
@@ -8,7 +8,7 @@ menu:
 weight: 207
 aliases:
   - /v2.0/visualize-data/variables/variable-types/
-v2.0/tags: [variables]
+influxdb/v2.0/tags: [variables]
 ---
 
 Variable types determine how a variable's list of possible values is populated.
diff --git a/content/influxdb/v2.0/visualize-data/variables/view-variables.md b/content/influxdb/v2.0/visualize-data/variables/view-variables.md
index a5414f957..ab0c02c39 100644
--- a/content/influxdb/v2.0/visualize-data/variables/view-variables.md
+++ b/content/influxdb/v2.0/visualize-data/variables/view-variables.md
@@ -8,7 +8,7 @@ menu:
 weight: 203
 aliases:
   - /v2.0/visualize-data/variables/view-variables/
-v2.0/tags: [variables]
+influxdb/v2.0/tags: [variables]
 ---
 
 View a list of dashboard variables in the InfluxDB user interface (UI) from an organization or from the Data Explorer.
diff --git a/content/influxdb/v2.0/write-data/_index.md b/content/influxdb/v2.0/write-data/_index.md
index 6ae2cf2fd..6001dc20c 100644
--- a/content/influxdb/v2.0/write-data/_index.md
+++ b/content/influxdb/v2.0/write-data/_index.md
@@ -11,7 +11,7 @@ aliases:
 menu:
   influxdb_2_0:
     name: Write data
-v2.0/tags: [write, line protocol]
+influxdb/v2.0/tags: [write, line protocol]
 related:
   - /influxdb/v2.0/write-data/use-telegraf/
   - /influxdb/v2.0/api/#tag/Write, InfluxDB API /write endpoint
diff --git a/content/influxdb/v2.0/write-data/best-practices/duplicate-points.md b/content/influxdb/v2.0/write-data/best-practices/duplicate-points.md
index 005605f2d..5354df214 100644
--- a/content/influxdb/v2.0/write-data/best-practices/duplicate-points.md
+++ b/content/influxdb/v2.0/write-data/best-practices/duplicate-points.md
@@ -12,7 +12,7 @@ menu:
   influxdb_2_0:
     name: Handle duplicate points
     parent: write-best-practices
-v2.0/tags: [best practices, write]
+influxdb/v2.0/tags: [best practices, write]
 ---
 
 InfluxDB identifies unique data points by their measurement, tag set, and timestamp
diff --git a/content/influxdb/v2.0/write-data/best-practices/optimize-writes.md b/content/influxdb/v2.0/write-data/best-practices/optimize-writes.md
index 213965940..64f97ae1e 100644
--- a/content/influxdb/v2.0/write-data/best-practices/optimize-writes.md
+++ b/content/influxdb/v2.0/write-data/best-practices/optimize-writes.md
@@ -8,7 +8,7 @@ aliases:
 menu:
   influxdb_2_0:
     parent: write-best-practices
-v2.0/tags: [best practices, write]
+influxdb/v2.0/tags: [best practices, write]
 ---
 
 Use these tips to optimize performance and system overhead when writing data to InfluxDB.
diff --git a/content/influxdb/v2.0/write-data/no-code/scrape-data/_index.md b/content/influxdb/v2.0/write-data/no-code/scrape-data/_index.md
index eb1d11369..2211149b9 100644
--- a/content/influxdb/v2.0/write-data/no-code/scrape-data/_index.md
+++ b/content/influxdb/v2.0/write-data/no-code/scrape-data/_index.md
@@ -11,7 +11,7 @@ aliases:
   - /v2.0/write-data/scrape-data
   - /v2.0/write-data/scrapable-endpoints
   - /v2.0/write-data/no-code/scrape-data/
-v2.0/tags: [scraper]
+influxdb/v2.0/tags: [scraper]
 menu:
   influxdb_2_0:
     name: Scrape data
diff --git a/content/influxdb/v2.0/write-data/no-code/scrape-data/manage-scrapers/_index.md b/content/influxdb/v2.0/write-data/no-code/scrape-data/manage-scrapers/_index.md
index feac6ddef..6ff8d1da7 100644
--- a/content/influxdb/v2.0/write-data/no-code/scrape-data/manage-scrapers/_index.md
+++ b/content/influxdb/v2.0/write-data/no-code/scrape-data/manage-scrapers/_index.md
@@ -11,7 +11,7 @@ menu:
     name: Manage scrapers
     parent: Scrape data
 weight: 201
-v2.0/tags: [scraper]
+influxdb/v2.0/tags: [scraper]
 products: [oss]
 ---
 
diff --git a/content/influxdb/v2.0/write-data/no-code/scrape-data/scrapable-endpoints.md b/content/influxdb/v2.0/write-data/no-code/scrape-data/scrapable-endpoints.md
index 854d4859a..472a7a80d 100644
--- a/content/influxdb/v2.0/write-data/no-code/scrape-data/scrapable-endpoints.md
+++ b/content/influxdb/v2.0/write-data/no-code/scrape-data/scrapable-endpoints.md
@@ -13,7 +13,7 @@ menu:
   influxdb_2_0:
     parent: Scrape data
 weight: 202
-v2.0/tags: [scraper]
+influxdb/v2.0/tags: [scraper]
 ---
 
 InfluxDB scrapers can collect data from any HTTP(S)-accessible endpoint that returns data
diff --git a/content/influxdb/v2.0/write-data/no-code/use-telegraf/manual-config.md b/content/influxdb/v2.0/write-data/no-code/use-telegraf/manual-config.md
index 9bf6f6bdd..cd14f7660 100644
--- a/content/influxdb/v2.0/write-data/no-code/use-telegraf/manual-config.md
+++ b/content/influxdb/v2.0/write-data/no-code/use-telegraf/manual-config.md
@@ -13,7 +13,7 @@ menu:
   influxdb_2_0:
     parent: Telegraf (agent)
 weight: 202
-v2.0/tags: [manually, plugin, mqtt]
+influxdb/v2.0/tags: [manually, plugin, mqtt]
 related:
   - /influxdb/v2.0/reference/telegraf-plugins/
   - /influxdb/v2.0/telegraf-configs/create/
diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html
index a11bd7e61..ecf29de53 100644
--- a/layouts/partials/sidebar.html
+++ b/layouts/partials/sidebar.html
@@ -1,6 +1,7 @@
 {{ $currentPage := . }}
 {{ $productPathData := findRE "[^/]+.*?" .RelPermalink }}
 {{ $product := index $productPathData 0 }}
+{{ $productName := (index .Site.Data.products $product).name }}
 {{ $currentVersion := index $productPathData 1 }}
 {{ $scratch := newScratch }}