diff --git a/docs-website/docusaurus.config.js b/docs-website/docusaurus.config.js
index df69e8513f..9bdba5f317 100644
--- a/docs-website/docusaurus.config.js
+++ b/docs-website/docusaurus.config.js
@@ -178,8 +178,8 @@ module.exports = {
       appId: "RK0UG797F3",
       apiKey: "39d7eb90d8b31d464e309375a52d674f",
       indexName: "datahubproject",
-      // contextualSearch: true,
-      // searchParameters: {},
+      insights: true,
+      contextualSearch: true,
       // debug: true,
     },
   },
diff --git a/docs-website/sidebars.js b/docs-website/sidebars.js
index c3a3bfc3a6..64433a2615 100644
--- a/docs-website/sidebars.js
+++ b/docs-website/sidebars.js
@@ -138,7 +138,15 @@ module.exports = {
       ],
     },
     {
-      Deployment: [
+      type: "category",
+      label: "Deployment",
+      link: {
+        type: "generated-index",
+        title: "Deployment Guides",
+        description:
+          "Learn how to deploy DataHub to your environment, set up authentication, manage upgrades, and more.",
+      },
+      items: [
         // The purpose of this section is to provide the minimum steps required to deploy DataHub to the vendor of your choosing
         "docs/deploy/aws",
         "docs/deploy/gcp",
@@ -395,7 +403,14 @@ module.exports = {
       ],
     },
     {
-      Features: [
+      type: "category",
+      label: "Features",
+      link: {
+        type: "generated-index",
+        title: "Feature Guides",
+        description: "Learn about the features of DataHub.",
+      },
+      items: [
         "docs/ui-ingestion",
         "docs/how/search",
         "docs/schema-history",
diff --git a/docs/how/search.md b/docs/how/search.md
index bf1c8e8632..6a5e85e547 100644
--- a/docs/how/search.md
+++ b/docs/how/search.md
@@ -2,14 +2,6 @@ import FeatureAvailability from '@site/src/components/FeatureAvailability';
 
 # About DataHub Search
 
-<!-- All Feature Guides should begin with `About DataHub ` to improve SEO -->
-
-<!-- 
-Update feature availability; by default, feature availability is Self-Hosted and Managed DataHub
-
-Add in `saasOnly` for Managed DataHub-only features
- -->
-
 <FeatureAvailability/>
 
 The **search bar** is an important mechanism for discovering data assets in DataHub. From the search bar, you can find Datasets, Columns, Dashboards, Charts, Data Pipelines, and more. Simply type in a term and press 'enter'.