diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 000000000..29d722bda
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1 @@
+* @juspay/hyperswitch-control-center-maintainers
\ No newline at end of file
diff --git a/src/entryPoints/hyperswitch/HyperSwitchApp.res b/src/entryPoints/hyperswitch/HyperSwitchApp.res
index afccd08b1..88ec82b75 100644
--- a/src/entryPoints/hyperswitch/HyperSwitchApp.res
+++ b/src/entryPoints/hyperswitch/HyperSwitchApp.res
@@ -208,7 +208,7 @@ let make = () => {
                   <div className="w-full max-w-fixedPageWidth px-9">
                     <Navbar
                       headerActions={<div className="relative flex items-center gap-4 my-2 ">
-                        // <HSwitchGlobalSearchBar />
+                        <HSwitchGlobalSearchBar />
                         <RenderIf condition={featureFlagDetails.switchMerchant}>
                           <SwitchMerchant userRole={userRole} />
                         </RenderIf>
diff --git a/src/screens/HyperSwitch/Utils/HSwitchGlobalSearchBar.res b/src/screens/HyperSwitch/Utils/HSwitchGlobalSearchBar.res
index ba66bf049..8dbfef132 100644
--- a/src/screens/HyperSwitch/Utils/HSwitchGlobalSearchBar.res
+++ b/src/screens/HyperSwitch/Utils/HSwitchGlobalSearchBar.res
@@ -189,7 +189,7 @@ let make = () => {
           acc->Js.Array2.concat(matchedSearchValues)
         }
 
-      | Heading(_) | CustomComponent(_) => []
+      | Heading(_) | CustomComponent(_) => acc->Js.Array2.concat([])
       }
     })
     setArr(_ => matchedList)