diff --git a/app/client/packages/design-system/ads/src/Box/Box.constants.ts b/app/client/packages/design-system/ads/src/Box/Box.constants.ts
index 2f270b1beedb..d7e13fd1342c 100644
--- a/app/client/packages/design-system/ads/src/Box/Box.constants.ts
+++ b/app/client/packages/design-system/ads/src/Box/Box.constants.ts
@@ -27,4 +27,6 @@ export const PropsToBeCssPrefixPrepended = [
   "px",
   "py",
   "gap",
+  "rowGap",
+  "columnGap",
 ];
diff --git a/app/client/src/IDE/utils/filterEntityGroupsBySearchTerm.test.ts b/app/client/src/IDE/utils/filterEntityGroupsBySearchTerm.test.ts
new file mode 100644
index 000000000000..645e4f4f8595
--- /dev/null
+++ b/app/client/src/IDE/utils/filterEntityGroupsBySearchTerm.test.ts
@@ -0,0 +1,31 @@
+import { filterEntityGroupsBySearchTerm } from ".";
+
+const groups = [
+  {
+    name: "Group 1",
+    items: [{ title: "file1" }, { title: "file2" }],
+  },
+  {
+    title: "Group 2",
+    items: [{ title: "file3" }, { title: "file4" }],
+  },
+];
+
+describe("filterEntityGroupsBySearchTerm", () => {
+  test.each([
+    ["", groups],
+    [
+      "file1",
+      [
+        {
+          name: "Group 1",
+          items: [{ title: "file1" }],
+        },
+      ],
+    ],
+    ["notfound", []],
+    ["file", groups],
+  ])("%s -> %j", (searchTerm, output) => {
+    expect(filterEntityGroupsBySearchTerm(searchTerm, groups)).toEqual(output);
+  });
+});
diff --git a/app/client/src/IDE/utils/filterEntityGroupsBySearchTerm.ts b/app/client/src/IDE/utils/filterEntityGroupsBySearchTerm.ts
new file mode 100644
index 000000000000..fcdbc425c0cb
--- /dev/null
+++ b/app/client/src/IDE/utils/filterEntityGroupsBySearchTerm.ts
@@ -0,0 +1,43 @@
+import Fuse, { type FuseOptions } from "fuse.js";
+
+/** Searchable properties. Must be defined in this way to be able to derive union type and satisfy FuseOptions  */
+const keys: ["title"] = ["title"];
+
+/** Union type to make sure these particular keys are present in collection that's being passed in for search. */
+type Keys = (typeof keys)[number];
+
+type BaseGroup = Record<PropertyKey, unknown>;
+type BaseItem = Record<Keys, string | number>;
+type Group<G extends BaseGroup, T extends BaseItem> = G & {
+  items: T[];
+};
+
+const FUSE_OPTIONS: FuseOptions<BaseItem> = {
+  shouldSort: true,
+  threshold: 0.1,
+  keys,
+};
+
+/** Filter entity groups by search term using fuse.js */
+export const filterEntityGroupsBySearchTerm = <
+  G extends BaseGroup,
+  T extends BaseItem,
+>(
+  searchTerm: string,
+  groups: Array<Group<G, T>>,
+): Array<Group<G, T>> => {
+  if (!searchTerm) {
+    return groups;
+  }
+
+  return groups.reduce((result: Array<Group<G, T>>, group) => {
+    const { items, ...rest } = group;
+    const searchResults = new Fuse(items, FUSE_OPTIONS).search(searchTerm);
+
+    if (searchResults.length) {
+      result.push({ ...rest, items: searchResults } as Group<G, T>);
+    }
+
+    return result;
+  }, []);
+};
diff --git a/app/client/src/IDE/utils/index.ts b/app/client/src/IDE/utils/index.ts
new file mode 100644
index 000000000000..987455e2e73e
--- /dev/null
+++ b/app/client/src/IDE/utils/index.ts
@@ -0,0 +1 @@
+export { filterEntityGroupsBySearchTerm } from "./filterEntityGroupsBySearchTerm";
diff --git a/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/Datasource.tsx b/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/Datasource.tsx
index 0771efb25e93..1162f39978a0 100644
--- a/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/Datasource.tsx
+++ b/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/Datasource.tsx
@@ -25,6 +25,7 @@ import { BOTTOMBAR_HEIGHT } from "./constants";
 import { useEditorType } from "ee/hooks";
 import { useParentEntityInfo } from "ee/hooks/datasourceEditorHooks";
 import DatasourceInfo from "./DatasourceInfo";
+import { getPlugin } from "ee/selectors/entitiesSelector";
 
 interface Props {
   datasourceId: string;
@@ -45,6 +46,8 @@ const Datasource = (props: Props) => {
     getPluginIdFromDatasourceId(state, props.datasourceId),
   );
 
+  const plugin = useSelector((state) => getPlugin(state, pluginId || ""));
+
   const editorType = useEditorType(location.pathname);
   const { parentEntityId } = useParentEntityInfo(editorType);
 
@@ -143,6 +146,7 @@ const Datasource = (props: Props) => {
         <DatasourceInfo
           datasourceId={props.datasourceId}
           datasourceName={props.datasourceName}
+          plugin={plugin}
           showEditButton={!isLoading}
         />
         <StatusDisplay
@@ -170,6 +174,7 @@ const Datasource = (props: Props) => {
           datasourceId={props.datasourceId}
           datasourceName={props.datasourceName}
           datasourceStructure={datasourceStructure}
+          plugin={plugin}
           selectedTable={selectedTable}
           setSelectedTable={setSelectedTable}
         />
diff --git a/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/DatasourceInfo.tsx b/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/DatasourceInfo.tsx
index e671e70d4afc..acfa33571870 100644
--- a/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/DatasourceInfo.tsx
+++ b/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/DatasourceInfo.tsx
@@ -10,16 +10,19 @@ import { getQueryParams } from "utils/URLUtils";
 import history from "utils/history";
 import { useEditorType } from "ee/hooks";
 import { useParentEntityInfo } from "ee/hooks/datasourceEditorHooks";
+import type { Plugin } from "api/PluginApi";
 
 interface Props {
   datasourceId: string;
   datasourceName: string;
   showEditButton: boolean;
+  plugin?: Plugin;
 }
 
 const DatasourceInfo = ({
   datasourceId,
   datasourceName,
+  plugin,
   showEditButton,
 }: Props) => {
   const editorType = useEditorType(location.pathname);
@@ -50,6 +53,7 @@ const DatasourceInfo = ({
       <DatasourceSelector
         datasourceId={datasourceId}
         datasourceName={datasourceName}
+        plugin={plugin}
       />
       {showEditButton && (
         <Tooltip content={createMessage(EDIT_DS_CONFIG)} placement="top">
diff --git a/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/DatasourceSelector/index.tsx b/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/DatasourceSelector/index.tsx
index 6f3ef2f510f1..252643232aaf 100644
--- a/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/DatasourceSelector/index.tsx
+++ b/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/DatasourceSelector/index.tsx
@@ -1,6 +1,5 @@
 import React from "react";
-import { UIComponentTypes } from "api/PluginApi";
-import { usePluginActionContext } from "PluginActionEditor/PluginActionContext";
+import { UIComponentTypes, type Plugin } from "api/PluginApi";
 import ApiDatasourceSelector from "./ApiDatasourceSelector";
 import QueryDatasourceSelector from "./QueryDatasourceSelector";
 import {
@@ -16,16 +15,17 @@ const API_FORM_COMPONENTS = [
 export interface DatasourceProps {
   datasourceId: string;
   datasourceName: string;
+  plugin?: Plugin;
 }
 
 const DatasourceSelector = (props: DatasourceProps) => {
-  const { plugin } = usePluginActionContext();
-
-  return API_FORM_COMPONENTS.includes(plugin.uiComponent) ? (
-    <ApiDatasourceSelector {...props} formName={API_EDITOR_FORM_NAME} />
-  ) : (
-    <QueryDatasourceSelector {...props} formName={QUERY_EDITOR_FORM_NAME} />
-  );
+  return props.plugin ? (
+    API_FORM_COMPONENTS.includes(props.plugin.uiComponent) ? (
+      <ApiDatasourceSelector {...props} formName={API_EDITOR_FORM_NAME} />
+    ) : (
+      <QueryDatasourceSelector {...props} formName={QUERY_EDITOR_FORM_NAME} />
+    )
+  ) : null;
 };
 
 export default DatasourceSelector;
diff --git a/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/DatasourceTables.tsx b/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/DatasourceTables.tsx
index 1664ff7667aa..ef23751816ef 100644
--- a/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/DatasourceTables.tsx
+++ b/app/client/src/PluginActionEditor/components/PluginActionResponse/components/DatasourceTab/DatasourceTables.tsx
@@ -9,12 +9,14 @@ import { refreshDatasourceStructure } from "actions/datasourceActions";
 import { useDispatch } from "react-redux";
 import { SchemaTableContainer } from "./styles";
 import DatasourceInfo from "./DatasourceInfo";
+import type { Plugin } from "api/PluginApi";
 
 interface Props {
   datasourceId: string;
   datasourceName: string;
   currentActionId: string;
   datasourceStructure: DatasourceStructure;
+  plugin?: Plugin;
   setSelectedTable: (table: string) => void;
   selectedTable: string | undefined;
 }
@@ -24,6 +26,7 @@ const DatasourceTables = ({
   datasourceId,
   datasourceName,
   datasourceStructure,
+  plugin,
   selectedTable,
   setSelectedTable,
 }: Props) => {
@@ -56,6 +59,7 @@ const DatasourceTables = ({
         <DatasourceInfo
           datasourceId={datasourceId}
           datasourceName={datasourceName}
+          plugin={plugin}
           showEditButton
         />
         <Button
diff --git a/app/client/src/pages/Editor/IDE/EditorPane/JS/Add.tsx b/app/client/src/pages/Editor/IDE/EditorPane/JS/Add.tsx
index 21ce6a223ffc..077100ed5647 100644
--- a/app/client/src/pages/Editor/IDE/EditorPane/JS/Add.tsx
+++ b/app/client/src/pages/Editor/IDE/EditorPane/JS/Add.tsx
@@ -11,13 +11,13 @@ import {
   useJSAdd,
 } from "ee/pages/Editor/IDE/EditorPane/JS/hooks";
 import type { ActionOperation } from "components/editorComponents/GlobalSearch/utils";
-import { createAddClassName, fuzzySearchInObjectItems } from "../utils";
+import { createAddClassName } from "../utils";
 import { FocusEntity } from "navigation/FocusEntity";
-import type { GroupedListProps } from "../components/types";
 import { EmptySearchResult } from "../components/EmptySearchResult";
 import { getIDEViewMode } from "selectors/ideSelectors";
 import type { FlexProps } from "@appsmith/ads";
 import { EditorViewMode } from "ee/entities/IDE/constants";
+import { filterEntityGroupsBySearchTerm } from "IDE/utils";
 
 const AddJS = () => {
   const dispatch = useDispatch();
@@ -53,7 +53,7 @@ const AddJS = () => {
     } as ListItemProps;
   };
 
-  const groups = groupedJsOperations.map(
+  const itemGroups = groupedJsOperations.map(
     ({ className, operations, title }) => ({
       groupTitle: title,
       className: className,
@@ -61,9 +61,9 @@ const AddJS = () => {
     }),
   );
 
-  const localGroups = fuzzySearchInObjectItems<GroupedListProps[]>(
+  const filteredItemGroups = filterEntityGroupsBySearchTerm(
     searchTerm,
-    groups,
+    itemGroups,
   );
 
   const extraPadding: FlexProps =
@@ -94,8 +94,10 @@ const AddJS = () => {
           titleMessage={EDITOR_PANE_TEXTS.js_create_tab_title}
         />
         <SearchInput onChange={setSearchTerm} value={searchTerm} />
-        {localGroups.length > 0 ? <GroupedList groups={localGroups} /> : null}
-        {localGroups.length === 0 && searchTerm !== "" ? (
+        {filteredItemGroups.length > 0 ? (
+          <GroupedList groups={filteredItemGroups} />
+        ) : null}
+        {filteredItemGroups.length === 0 && searchTerm !== "" ? (
           <EmptySearchResult
             type={createMessage(EDITOR_PANE_TEXTS.search_objects.jsObject)}
           />
diff --git a/app/client/src/pages/Editor/IDE/EditorPane/JS/List.tsx b/app/client/src/pages/Editor/IDE/EditorPane/JS/List.tsx
index 77fbd42ad966..bdfd8a15c965 100644
--- a/app/client/src/pages/Editor/IDE/EditorPane/JS/List.tsx
+++ b/app/client/src/pages/Editor/IDE/EditorPane/JS/List.tsx
@@ -3,7 +3,6 @@ import { useSelector } from "react-redux";
 import { Flex, Text } from "@appsmith/ads";
 import styled from "styled-components";
 
-import type { EditorSegmentList } from "ee/selectors/appIDESelectors";
 import { selectJSSegmentEditorList } from "ee/selectors/appIDESelectors";
 import { useActiveActionBaseId } from "ee/pages/Editor/Explorer/hooks";
 import {
@@ -20,9 +19,9 @@ import { useJSAdd } from "ee/pages/Editor/IDE/EditorPane/JS/hooks";
 import { JSListItem } from "ee/pages/Editor/IDE/EditorPane/JS/ListItem";
 import { BlankState } from "./BlankState";
 import { AddAndSearchbar } from "../components/AddAndSearchbar";
-import { fuzzySearchInObjectItems } from "../utils";
 import { EmptySearchResult } from "../components/EmptySearchResult";
 import { EDITOR_PANE_TEXTS, createMessage } from "ee/constants/messages";
+import { filterEntityGroupsBySearchTerm } from "IDE/utils";
 
 const JSContainer = styled(Flex)`
   & .t--entity-item {
@@ -34,7 +33,7 @@ const JSContainer = styled(Flex)`
 const ListJSObjects = () => {
   const [searchTerm, setSearchTerm] = useState("");
   const pageId = useSelector(getCurrentPageId);
-  const files = useSelector(selectJSSegmentEditorList);
+  const itemGroups = useSelector(selectJSSegmentEditorList);
   const activeActionBaseId = useActiveActionBaseId();
   const applicationId = useSelector(getCurrentApplicationId);
 
@@ -42,9 +41,9 @@ const ListJSObjects = () => {
 
   const isFeatureEnabled = useFeatureFlag(FEATURE_FLAG.license_gac_enabled);
 
-  const localFiles = fuzzySearchInObjectItems<EditorSegmentList>(
+  const filteredItemGroups = filterEntityGroupsBySearchTerm(
     searchTerm,
-    files,
+    itemGroups,
   );
 
   const canCreateActions = getHasCreateActionPermission(
@@ -64,7 +63,7 @@ const ListJSObjects = () => {
       px="spaces-3"
       py="spaces-3"
     >
-      {files && files.length > 0 ? (
+      {itemGroups && itemGroups.length > 0 ? (
         <AddAndSearchbar
           hasAddPermission={canCreateActions}
           onAddClick={openAddJS}
@@ -83,7 +82,7 @@ const ListJSObjects = () => {
           gap="spaces-4"
           overflowY="auto"
         >
-          {localFiles.map(({ group, items }) => {
+          {filteredItemGroups.map(({ group, items }) => {
             return (
               <Flex flexDirection={"column"} key={group}>
                 {group !== "NA" ? (
@@ -112,7 +111,7 @@ const ListJSObjects = () => {
               </Flex>
             );
           })}
-          {localFiles.length === 0 && searchTerm !== "" ? (
+          {filteredItemGroups.length === 0 && searchTerm !== "" ? (
             <EmptySearchResult
               type={createMessage(EDITOR_PANE_TEXTS.search_objects.jsObject)}
             />
@@ -120,7 +119,7 @@ const ListJSObjects = () => {
         </Flex>
       </FilesContextProvider>
 
-      {(!files || files.length === 0) && <BlankState />}
+      {(!itemGroups || itemGroups.length === 0) && <BlankState />}
     </JSContainer>
   );
 };
diff --git a/app/client/src/pages/Editor/IDE/EditorPane/Query/Add.tsx b/app/client/src/pages/Editor/IDE/EditorPane/Query/Add.tsx
index 60d2051c526f..b28548f12676 100644
--- a/app/client/src/pages/Editor/IDE/EditorPane/Query/Add.tsx
+++ b/app/client/src/pages/Editor/IDE/EditorPane/Query/Add.tsx
@@ -9,13 +9,12 @@ import {
   useGroupedAddQueryOperations,
   useQueryAdd,
 } from "ee/pages/Editor/IDE/EditorPane/Query/hooks";
-import { fuzzySearchInObjectItems } from "../utils";
-import type { GroupedListProps } from "../components/types";
 import { EmptySearchResult } from "../components/EmptySearchResult";
 import { useSelector } from "react-redux";
 import { getIDEViewMode } from "selectors/ideSelectors";
 import type { FlexProps } from "@appsmith/ads";
 import { EditorViewMode } from "ee/entities/IDE/constants";
+import { filterEntityGroupsBySearchTerm } from "IDE/utils";
 
 const AddQuery = () => {
   const [searchTerm, setSearchTerm] = useState("");
@@ -24,15 +23,15 @@ const AddQuery = () => {
   const { closeAddQuery } = useQueryAdd();
   const ideViewMode = useSelector(getIDEViewMode);
 
-  const groups = groupedActionOperations.map((group) => ({
+  const itemGroups = groupedActionOperations.map((group) => ({
     groupTitle: group.title,
     className: group.className,
     items: getListItems(group.operations),
   }));
 
-  const localGroups = fuzzySearchInObjectItems<GroupedListProps[]>(
+  const filteredItemGroups = filterEntityGroupsBySearchTerm(
     searchTerm,
-    groups,
+    itemGroups,
   );
 
   const extraPadding: FlexProps =
@@ -63,8 +62,10 @@ const AddQuery = () => {
           titleMessage={EDITOR_PANE_TEXTS.query_create_tab_title}
         />
         <SearchInput autoFocus onChange={setSearchTerm} value={searchTerm} />
-        {localGroups.length > 0 ? <GroupedList groups={localGroups} /> : null}
-        {localGroups.length === 0 && searchTerm !== "" ? (
+        {filteredItemGroups.length > 0 ? (
+          <GroupedList groups={filteredItemGroups} />
+        ) : null}
+        {filteredItemGroups.length === 0 && searchTerm !== "" ? (
           <EmptySearchResult
             type={createMessage(EDITOR_PANE_TEXTS.search_objects.datasources)}
           />
diff --git a/app/client/src/pages/Editor/IDE/EditorPane/Query/List.tsx b/app/client/src/pages/Editor/IDE/EditorPane/Query/List.tsx
index 00a0c6faba97..0241c779e844 100644
--- a/app/client/src/pages/Editor/IDE/EditorPane/Query/List.tsx
+++ b/app/client/src/pages/Editor/IDE/EditorPane/Query/List.tsx
@@ -11,7 +11,6 @@ import {
 } from "selectors/editorSelectors";
 import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
 import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
-import type { EditorSegmentList } from "ee/selectors/appIDESelectors";
 import { selectQuerySegmentEditorList } from "ee/selectors/appIDESelectors";
 import { ActionParentEntityType } from "ee/entities/Engine/actionHelpers";
 import { FilesContextProvider } from "pages/Editor/Explorer/Files/FilesContextProvider";
@@ -20,21 +19,21 @@ import { QueryListItem } from "ee/pages/Editor/IDE/EditorPane/Query/ListItem";
 import { getShowWorkflowFeature } from "ee/selectors/workflowSelectors";
 import { BlankState } from "./BlankState";
 import { AddAndSearchbar } from "../components/AddAndSearchbar";
-import { fuzzySearchInObjectItems } from "../utils";
 import { EmptySearchResult } from "../components/EmptySearchResult";
 import { EDITOR_PANE_TEXTS, createMessage } from "ee/constants/messages";
+import { filterEntityGroupsBySearchTerm } from "IDE/utils";
 
 const ListQuery = () => {
   const [searchTerm, setSearchTerm] = useState("");
   const pageId = useSelector(getCurrentPageId) as string;
-  const files = useSelector(selectQuerySegmentEditorList);
+  const itemGroups = useSelector(selectQuerySegmentEditorList);
   const activeActionBaseId = useActiveActionBaseId();
   const pagePermissions = useSelector(getPagePermissions);
   const isFeatureEnabled = useFeatureFlag(FEATURE_FLAG.license_gac_enabled);
 
-  const localFiles = fuzzySearchInObjectItems<EditorSegmentList>(
+  const filteredItemGroups = filterEntityGroupsBySearchTerm(
     searchTerm,
-    files,
+    itemGroups,
   );
 
   const canCreateActions = getHasCreateActionPermission(
@@ -55,7 +54,7 @@ const ListQuery = () => {
       px="spaces-3"
       py="spaces-3"
     >
-      {files.length > 0 ? (
+      {itemGroups.length > 0 ? (
         <AddAndSearchbar
           hasAddPermission={canCreateActions}
           onAddClick={openAddQuery}
@@ -63,7 +62,7 @@ const ListQuery = () => {
         />
       ) : null}
       <Flex flexDirection={"column"} gap="spaces-4" overflowY="auto">
-        {localFiles.map(({ group, items }) => {
+        {filteredItemGroups.map(({ group, items }) => {
           return (
             <Flex flexDirection={"column"} key={group}>
               <Flex py="spaces-1">
@@ -96,14 +95,14 @@ const ListQuery = () => {
             </Flex>
           );
         })}
-        {localFiles.length === 0 && searchTerm !== "" ? (
+        {filteredItemGroups.length === 0 && searchTerm !== "" ? (
           <EmptySearchResult
             type={createMessage(EDITOR_PANE_TEXTS.search_objects.queries)}
           />
         ) : null}
       </Flex>
 
-      {Object.keys(files).length === 0 && <BlankState />}
+      {Object.keys(itemGroups).length === 0 && <BlankState />}
     </Flex>
   );
 };
diff --git a/app/client/src/pages/Editor/IDE/EditorPane/fuzzySearchInFiles.test.ts b/app/client/src/pages/Editor/IDE/EditorPane/fuzzySearchInFiles.test.ts
deleted file mode 100644
index 4454723f7b1e..000000000000
--- a/app/client/src/pages/Editor/IDE/EditorPane/fuzzySearchInFiles.test.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import type { EditorSegmentList } from "ee/selectors/appIDESelectors";
-import { fuzzySearchInObjectItems } from "./utils";
-import { PluginType } from "entities/Action";
-
-const sampleFiles: EditorSegmentList = [
-  {
-    group: "Group 1",
-    items: [
-      { title: "file1.js", type: PluginType.API, key: "file1" },
-      { title: "file2.js", type: PluginType.API, key: "file2" },
-    ],
-  },
-  {
-    group: "Group 2",
-    items: [
-      { title: "file3.js", type: PluginType.API, key: "file3" },
-      { title: "file4.js", type: PluginType.API, key: "file4" },
-    ],
-  },
-];
-
-describe("fuzzySearchInObjectItems", () => {
-  it("should return all files when the search string is empty", () => {
-    const result = fuzzySearchInObjectItems("", sampleFiles);
-
-    expect(result).toEqual(sampleFiles);
-  });
-
-  it("should return the correct file when the search string exactly matches a file title", () => {
-    const result = fuzzySearchInObjectItems("file1", sampleFiles);
-
-    expect(result).toEqual([
-      {
-        group: "Group 1",
-        items: [{ title: "file1.js", type: PluginType.API, key: "file1" }],
-      },
-    ]);
-  });
-
-  it("should return an empty array when no files match the search string", () => {
-    const result = fuzzySearchInObjectItems("nonexistentfile", sampleFiles);
-
-    expect(result).toEqual([]);
-  });
-
-  it("should return all files containing the common substring in their titles", () => {
-    const result = fuzzySearchInObjectItems("file", sampleFiles);
-
-    expect(result).toEqual(sampleFiles);
-  });
-});
diff --git a/app/client/src/pages/Editor/IDE/EditorPane/utils.ts b/app/client/src/pages/Editor/IDE/EditorPane/utils.ts
index cb7a5b0646ad..cb43762c7af7 100644
--- a/app/client/src/pages/Editor/IDE/EditorPane/utils.ts
+++ b/app/client/src/pages/Editor/IDE/EditorPane/utils.ts
@@ -1,34 +1,3 @@
-import Fuse from "fuse.js";
-
 export const createAddClassName = (name: string) => {
   return "t--datasoucre-create-option-" + name.toLowerCase().replace(/ /g, "_");
 };
-
-const FUSE_OPTIONS = {
-  shouldSort: true,
-  threshold: 0.1,
-  keys: ["title"],
-};
-
-// TODO: Fix this the next time the file is edited
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export const fuzzySearchInObjectItems = <T extends any[]>(
-  searchStr: string,
-  files: T,
-): T => {
-  if (searchStr && searchStr !== "") {
-    const newFiles = files
-      .map((group) => {
-        const items = group["items"];
-        const fuse = new Fuse(items, FUSE_OPTIONS);
-        const resultItems = fuse.search(searchStr);
-
-        return { ...group, items: resultItems };
-      })
-      .filter((group) => group.items.length > 0);
-
-    return newFiles as T;
-  }
-
-  return files;
-};
diff --git a/app/client/src/workers/Evaluation/__tests__/evaluation.test.ts b/app/client/src/workers/Evaluation/__tests__/evaluation.test.ts
index ad1a2936e742..258a39c8fbf2 100644
--- a/app/client/src/workers/Evaluation/__tests__/evaluation.test.ts
+++ b/app/client/src/workers/Evaluation/__tests__/evaluation.test.ts
@@ -593,8 +593,8 @@ describe("DataTreeEvaluator", () => {
     );
     evaluator.evalAndValidateFirstTree();
     // Hard check to not regress on the number of clone operations. Try to improve this number.
-    expect(klonaFullSpy).toBeCalledTimes(40);
-    expect(klonaJsonSpy).toBeCalledTimes(3);
+    expect(klonaFullSpy).toBeCalledTimes(15);
+    expect(klonaJsonSpy).toBeCalledTimes(28);
   });
 
   it("Evaluates a binding in first run", () => {
@@ -1115,7 +1115,7 @@ describe("DataTreeEvaluator", () => {
       unEvalUpdates,
     );
     // Hard check to not regress on the number of clone operations. Try to improve this number.
-    expect(klonaFullSpy).toBeCalledTimes(6);
-    expect(klonaJsonSpy).toBeCalledTimes(2);
+    expect(klonaFullSpy).toBeCalledTimes(4);
+    expect(klonaJsonSpy).toBeCalledTimes(4);
   });
 });
diff --git a/app/client/src/workers/common/DataTreeEvaluator/index.ts b/app/client/src/workers/common/DataTreeEvaluator/index.ts
index 095d9bd25798..f14873229a2d 100644
--- a/app/client/src/workers/common/DataTreeEvaluator/index.ts
+++ b/app/client/src/workers/common/DataTreeEvaluator/index.ts
@@ -1207,7 +1207,7 @@ export default class DataTreeEvaluator {
             );
 
             set(contextTree, fullPropertyPath, parsedValue);
-            set(safeTree, fullPropertyPath, klona(parsedValue));
+            set(safeTree, fullPropertyPath, klonaJSON(parsedValue));
 
             staleMetaIds = staleMetaIds.concat(
               getStaleMetaStateIds({
@@ -1253,7 +1253,7 @@ export default class DataTreeEvaluator {
             if (!requiresEval) continue;
 
             set(contextTree, fullPropertyPath, evalPropertyValue);
-            set(safeTree, fullPropertyPath, klona(evalPropertyValue));
+            set(safeTree, fullPropertyPath, klonaJSON(evalPropertyValue));
             break;
           }
           case ENTITY_TYPE.JSACTION: {
@@ -1290,7 +1290,7 @@ export default class DataTreeEvaluator {
              * Their evaluated values need to be reset only when the variable is modified by the user.
              * When uneval value of a js variable hasn't changed, it means that the previously evaluated values are in both trees already  */
             if (!skipVariableValueAssignment) {
-              const valueForSafeTree = klona(evalValue);
+              const valueForSafeTree = klonaJSON(evalValue);
 
               set(contextTree, fullPropertyPath, evalValue);
               set(safeTree, fullPropertyPath, valueForSafeTree);
@@ -1305,7 +1305,7 @@ export default class DataTreeEvaluator {
           }
           default:
             set(contextTree, fullPropertyPath, evalPropertyValue);
-            set(safeTree, fullPropertyPath, klona(evalPropertyValue));
+            set(safeTree, fullPropertyPath, klonaJSON(evalPropertyValue));
         }
       }
     } catch (error) {
@@ -1793,7 +1793,7 @@ export default class DataTreeEvaluator {
     bindings: string[],
     executionParams?: Record<string, unknown> | string,
   ) {
-    const dataTree = klona(this.evalTree);
+    const dataTree = klonaJSON(this.evalTree);
     // We might get execution params as an object or as a string.
     // If the user has added a proper object (valid case) it will be an object
     // If they have not added any execution params or not an object
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/EmailConfig.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/EmailConfig.java
index f5440901af0c..5e1de6a6f063 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/EmailConfig.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/EmailConfig.java
@@ -29,9 +29,6 @@ public class EmailConfig {
     @Value("${reply.to}")
     private String replyTo;
 
-    @Value("${emails.welcome.enabled:true}")
-    private boolean isWelcomeEmailEnabled;
-
     @Value("${mail.support}")
     private String supportEmailAddress;
 
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/AstServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/AstServiceCEImpl.java
index 950cc8578ca8..95cb8b7e2b61 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/AstServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/AstServiceCEImpl.java
@@ -15,6 +15,7 @@
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
+import org.springframework.util.StringUtils;
 import org.springframework.web.reactive.function.client.WebClient;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -144,6 +145,14 @@ public Mono<Map<MustacheBindingToken, String>> refactorNameInDynamicBindings(
 
         return Flux.fromIterable(bindingValues)
                 .flatMap(bindingValue -> {
+                    if (!StringUtils.hasText(bindingValue.getValue())) {
+                        // If the binding value is null or empty, it indicates an incorrect entry in the
+                        // dynamicBindingPathList.
+                        // Such bindings are considered invalid and can be safely discarded during refactoring.
+                        // Therefore, we return an empty response.
+
+                        return Mono.empty();
+                    }
                     if (!bindingValue.getValue().contains(oldName)) {
                         // This case is not handled in RTS either, so skipping the RTS call here will not affect the
                         // behavior.
diff --git a/app/server/appsmith-server/src/main/resources/application.properties b/app/server/appsmith-server/src/main/resources/application.properties
index b693c73a1cb4..37a09c3ed519 100644
--- a/app/server/appsmith-server/src/main/resources/application.properties
+++ b/app/server/appsmith-server/src/main/resources/application.properties
@@ -79,9 +79,6 @@ spring.mail.properties.mail.smtp.auth=${APPSMITH_MAIL_SMTP_AUTH:}
 spring.mail.properties.mail.smtp.starttls.enable=${APPSMITH_MAIL_SMTP_TLS_ENABLED:}
 admin.emails = ${APPSMITH_ADMIN_EMAILS:}
 
-# Configuring individual emails
-emails.welcome.enabled = ${APPSMITH_EMAILS_WELCOME_ENABLED:true}
-
 # Appsmith Cloud Services
 appsmith.cloud_services.base_url = ${APPSMITH_CLOUD_SERVICES_BASE_URL:}
 appsmith.cloud_services.signature_base_url = ${APPSMITH_CLOUD_SERVICES_SIGNATURE_BASE_URL:}
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/ASTServiceCETest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/ASTServiceCETest.java
index 09f91cba6178..019654cc475d 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/ASTServiceCETest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/ASTServiceCETest.java
@@ -10,6 +10,7 @@
 import reactor.test.StepVerifier;
 
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
@@ -60,7 +61,8 @@ void refactorNameInDynamicBindings_validBindings_returnsUpdatedBindings() {
         token1.setValue("abc['foo']");
         MustacheBindingToken token2 = new MustacheBindingToken();
         token2.setValue("xyz['bar']");
-        Set<MustacheBindingToken> bindings = Set.of(token1, token2);
+        MustacheBindingToken dummyToken = new MustacheBindingToken();
+        Set<MustacheBindingToken> bindings = Set.of(token1, token2, dummyToken);
 
         String refactoredScript1 = "xyz['foo']";
         String refactoredScript2 = "xyz['bar']";
@@ -71,7 +73,7 @@ void refactorNameInDynamicBindings_validBindings_returnsUpdatedBindings() {
 
         doReturn(Mono.just(responseMap1))
                 .when(astService)
-                .refactorNameInDynamicBindings(Set.of(token1, token2), "abc", "xyz", 2, false);
+                .refactorNameInDynamicBindings(Set.of(token1, token2, dummyToken), "abc", "xyz", 2, false);
 
         Mono<Map<MustacheBindingToken, String>> result =
                 astService.refactorNameInDynamicBindings(bindings, "abc", "xyz", 2, false);
@@ -85,6 +87,23 @@ void refactorNameInDynamicBindings_validBindings_returnsUpdatedBindings() {
                 .verifyComplete();
     }
 
+    @Test
+    void refactorNameInDynamicBindings_nullBindingValue_returnsEmptyMap() {
+        MustacheBindingToken token1 = new MustacheBindingToken();
+
+        Set<MustacheBindingToken> bindings = new HashSet<>();
+        bindings.add(token1);
+
+        Mono<Map<MustacheBindingToken, String>> result =
+                astService.refactorNameInDynamicBindings(bindings, "abc", "xyz", 2, false);
+
+        StepVerifier.create(result)
+                .assertNext(map -> {
+                    assertThat(map).hasSize(0);
+                })
+                .verifyComplete();
+    }
+
     @Test
     void refactorNameInDynamicBindings_whenValidJSObjectRequest_thenReturnUpdatedScript() {
         MustacheBindingToken token = new MustacheBindingToken();