diff --git a/theme/fetch-ai-docs/components/instant-algolia-search.tsx b/theme/fetch-ai-docs/components/instant-algolia-search.tsx
index fb93f077..8961444a 100644
--- a/theme/fetch-ai-docs/components/instant-algolia-search.tsx
+++ b/theme/fetch-ai-docs/components/instant-algolia-search.tsx
@@ -12,32 +12,23 @@ import { getComponents } from "../mdx-components";
 import { useConfig } from "../contexts";
 import { remark } from "remark";
 import remarkHTML from "remark-html";
-import type { Item as NormalItem } from "nextra/normalize-pages";
 import { Input } from "./input";
 import Modal from "./search-model";
 import { DarkShortcut, Shortcut } from "src/icons/shared-icons";
 import { useTheme } from "next-themes";
 import { ThemeMode } from "../helpers";
 
-type MyItem = NormalItem & {
-  tags?: string[];
-};
-
 const searchClient = algoliasearch(
-  `${process.env.NEXT_PUBLIC_ALGOLIA_APP_ID}`,
-  `${process.env.NEXT_PUBLIC_ALGOLIA_API_KEY}`,
+  `4MNO2TMYQ5`, //4MNO2TMYQ5
+  `79f05f43517b76c1b8af1c6c667dbaba`,
 );
-const indexName = `${process.env.NEXT_PUBLIC_ALGOLIA_INDEX}`;
+const indexName = `Fetch ai Docs`;
 
 const markdownToHTML = (markdownString) => {
   return remark().use(remarkHTML).processSync(markdownString).toString();
 };
 
-export const InstantAlgoliaSearch = ({
-  directories,
-}: {
-  directories: MyItem[];
-}) => {
+export const InstantAlgoliaSearch = () => {
   const config = useConfig();
   const router = useRouter();
   const [modalIsOpen, setModalIsOpen] = useState(false);
@@ -69,8 +60,8 @@ export const InstantAlgoliaSearch = ({
       }
     }
 
-    const actualPath = path.split("/docs")[1];
-    router.push(actualPath);
+    // const actualPath = path.split("/docs")[1];
+    router.push(path);
     setModalIsOpen(false);
   };
 
@@ -107,121 +98,59 @@ export const InstantAlgoliaSearch = ({
     );
   };
 
-  const directoriesWithTags = directories
-    .filter((directory) => !!("tags" in directory))
-    .map(({ route, tags }) => ({ route, tags }));
-
   const CustomHits = connectHits(({ hits }) => {
     if (hits.length <= 0) {
       return <NoResultsBoundary fallback={"No more information available !"} />;
     }
 
-    const groupedHits = {};
-
-    for (const hit of hits) {
-      const route = hit.path.split("#")[0];
-
-      if (!groupedHits[route]) {
-        groupedHits[route] = [];
-      }
-
-      groupedHits[route].push(hit);
-    }
-
-    const tagColors = [
-      "bg-indigo",
-      "bg-orange",
-      "bg-light-green",
-      "bg-blue-150",
-      "bg-yellow-150",
-      "bg-red-150",
-    ];
-
     return (
-      <div className="nextra-scrollbar nx-border nx-border-gray-200 nx-bg-white dark:nx-bg-dark-main dark:nx-border-none nx-absolute nx-top-full nx-z-20 nx-mt-2 nx-overflow-auto nx-overscroll-contain nx-rounded-xl nx-py-2.5 nx-shadow-xl small-screen-height  sm:nx-max-h-[min(calc(50vh-11rem-env(safe-area-inset-bottom)),400px)] md:nx-max-h-[min(calc(100vh-5rem-env(safe-area-inset-bottom)),400px)] nx-inset-x-0 ltr:md:nx-left-auto rtl:md:nx-right-auto contrast-more:nx-border contrast-more:nx-border-gray-900 contrast-more:dark:nx-border-gray-50 nx-max-w-full">
-        {Object.entries(groupedHits).map(([route, hitsForRoute]) => (
-          <div key={route}>
-            <div className="nx-py-2 nx-bg-grey-200 nx-text-sm nx-text-grey-600 nx-font-semibold nx-tracking-loose nx-uppercase dark:nx-bg-dark-mode-white-2">
-              <span className="nx-px-4 nx-text-sm nx-flex nx-gap-4 dark:nx-text-white-90">
-                <div className="nx-my-1">{route.split("/").pop()}</div>
-                {directoriesWithTags.map((directory) => {
-                  if (route.includes(directory.route)) {
-                    return (
-                      <div key={directory.route}>
-                        <div className="nx-flex nx-flex-wrap nx-gap-2 nx-max-w-50rem">
-                          {directory.tags.slice(0, 3).map((tag, index) => (
-                            <span
-                              key={index}
-                              className={`nx-text-fetch-main nx-text-xs nx-font-normal nx-rounded nx-px-1 nx-py-1 nx-${
-                                tagColors[index % tagColors.length]
-                              }`}
-                            >
-                              {tag}
-                            </span>
-                          ))}
-                        </div>
-                      </div>
-                    );
-                  }
-                  return null;
-                })}
-              </span>
-            </div>
-
-            <ul role="listbox" aria-labelledby="search-label">
-              {
-                // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                (hitsForRoute as any[]).map((hit) => (
-                  <li
-                    role="option"
-                    aria-selected="false"
-                    className="nx-relative nx-border-grey-200 nx-bg-search-result nx-cursor-pointer"
-                    key={hit.objectId}
-                  >
-                    <div
-                      className="nx-flex nx-justify-between nx-items-center nx-leading-normal nx-py-2 nx-px-6 nx-transition-colors nx-duration-5 nx-ease-out nx-overflow-hidden nx-text-grey-900 nx-bg-transparent dark:nx-bg-dark-main"
-                      onClick={() => onClickSearchResult(hit.path)}
-                    >
-                      <div className="w-full nx-flex nx-flex-col nx-relative">
-                        <div className="nx-text-base nx-font-semibold nx-text-fetch-main dark:nx-text-white-80">
-                          {hit.title.replaceAll("#", "")}
-                        </div>
-
-                        {hit.content.length > 0 && (
-                          <div className="w-full nx-relative nx-text-sm nx-leading-tight nx-mt-4 nx-xl:mt-2 nx-mb-2">
-                            <MDXProvider
-                              components={getComponents({
-                                isRawLayout: false,
-                                components: config.components,
-                              })}
-                            >
-                              <div
-                                className="nx-flex-grow-1 nx-text-fetch-content nx-font-normal nx-text-fetch-main nx-text-sm dark:nx-text-white-60 dark:nx-bg-dark-main"
-                                dangerouslySetInnerHTML={{
-                                  __html: `${markdownToHTML(hit.content).slice(
-                                    0,
-                                    500,
-                                  )}${hit.content.length > 500 ? "..." : ""}`,
-                                }}
-                              />
-                            </MDXProvider>
-                          </div>
-                        )}
-                        <div className="nx-text-sm nx-text-grey-600 dark:nx-text-indigo-250">
-                          {hit.path
-                            .replace(/^\/docs\//, "")
-                            .split("/")
-                            .join(" > ")}
-                        </div>
-                      </div>
+      <div className="nextra-scrollbar nx-w-full nx-border nx-border-gray-200 nx-bg-white dark:nx-bg-dark-main dark:nx-border-none nx-absolute nx-top-full nx-z-20 nx-mt-2 nx-overflow-auto nx-overscroll-contain nx-py-2.5 nx-shadow-xl small-screen-height  sm:nx-max-h-[min(calc(50vh-11rem-env(safe-area-inset-bottom)),400px)] md:nx-max-h-[min(calc(100vh-5rem-env(safe-area-inset-bottom)),400px)] nx-inset-x-0 ltr:md:nx-left-auto rtl:md:nx-right-auto contrast-more:nx-border contrast-more:nx-border-gray-900 contrast-more:dark:nx-border-gray-50 nx-max-w-full">
+        <ul role="listbox" aria-labelledby="search-label">
+          {hits.map((hit) => (
+            <li
+              role="option"
+              aria-selected="false"
+              className="nx-relative nx-border-grey-200 nx-bg-search-result nx-cursor-pointer"
+              key={hit.objectId}
+            >
+              <div
+                className="nx-flex nx-justify-between nx-items-center nx-leading-normal nx-py-2 nx-px-6 nx-transition-colors nx-duration-5 nx-ease-out nx-overflow-hidden nx-text-grey-900 nx-bg-transparent dark:nx-bg-dark-main"
+                onClick={() => onClickSearchResult(hit.url)}
+              >
+                <div className="w-full nx-flex nx-flex-col nx-relative">
+                  <div className="nx-text-base nx-font-semibold nx-text-fetch-main dark:nx-text-white-80">
+                    {hit.anchor || hit.hierarchy.lvl1 || hit.hierarchy.lvl0}
+                  </div>
+
+                  {hit.content && hit.content.length > 0 && (
+                    <div className="w-full nx-relative nx-text-sm nx-leading-tight nx-mt-4 nx-xl:mt-2 nx-mb-2">
+                      <MDXProvider
+                        components={getComponents({
+                          isRawLayout: false,
+                          components: config.components,
+                        })}
+                      >
+                        <div
+                          className="nx-flex-grow-1 nx-text-fetch-content nx-font-normal nx-text-fetch-main nx-text-sm dark:nx-text-white-60 dark:nx-bg-dark-main"
+                          dangerouslySetInnerHTML={{
+                            __html: `${markdownToHTML(hit.content).slice(
+                              0,
+                              500,
+                            )}${hit.content.length > 500 ? "..." : ""}`,
+                          }}
+                        />
+                      </MDXProvider>
                     </div>
-                    <div className="nx-border-b" />
-                  </li>
-                ))
-              }
-            </ul>
-          </div>
-        ))}
+                  )}
+                  <div className="nx-text-sm nx-text-grey-600 dark:nx-text-indigo-250">
+                    {hit.url}
+                  </div>
+                </div>
+              </div>
+              <div className="nx-border-b" />
+            </li>
+          ))}
+        </ul>
       </div>
     );
   });
diff --git a/theme/fetch-ai-docs/components/navbar.tsx b/theme/fetch-ai-docs/components/navbar.tsx
index f741b46e..863406fd 100644
--- a/theme/fetch-ai-docs/components/navbar.tsx
+++ b/theme/fetch-ai-docs/components/navbar.tsx
@@ -270,11 +270,11 @@ export function Navbar({ items }: NavBarProps): ReactElement {
             })}
           </div>
           <div className="nx-flex nx-items-center">
-            {/* <div className="nx-hidden nx-m-l-auto nx-search-width search-bar-desktop md:nx-inline-block">
+            <div className="nx-hidden nx-m-l-auto nx-search-width search-bar-desktop md:nx-inline-block">
               {renderComponent(config.search.component, {
-                directories: flatDirectories,
+                directories: [],
               })}
-            </div> */}
+            </div>
             {/* <div ref={dropdownRef} className="nx-relative">
               <Gear onClickHandler={handleOpenClose}/>
               {openOs && (
@@ -306,7 +306,7 @@ export function Navbar({ items }: NavBarProps): ReactElement {
         </div>
         {/* <div className="search-bar-mobile nx-mt-6 nx-mb-2">
           {renderComponent(config.search.component, {
-            directories: flatDirectories,
+            directories: [],
             // className: "md:nx-hidden nx-mt-6 nx-mb-2",
           })}
         </div> */}
diff --git a/theme/fetch-ai-docs/constants.tsx b/theme/fetch-ai-docs/constants.tsx
index 8bf2e0b4..c7a3133f 100644
--- a/theme/fetch-ai-docs/constants.tsx
+++ b/theme/fetch-ai-docs/constants.tsx
@@ -268,8 +268,8 @@ export const DEFAULT_THEME: DocsThemeConfig = {
     ),
   },
   search: {
-    component: function Search({ directories }) {
-      return <InstantAlgoliaSearch directories={directories} />;
+    component: function Search() {
+      return <InstantAlgoliaSearch />;
     },
     emptyResult: (
       <span className="nx-block nx-select-none nx-p-8 nx-text-center nx-text-sm nx-text-gray-400">