diff --git a/frontend/nginx/nginx.prod.conf b/frontend/nginx/nginx.prod.conf
index d9c369326..7fe2f81fe 100644
--- a/frontend/nginx/nginx.prod.conf
+++ b/frontend/nginx/nginx.prod.conf
@@ -3,7 +3,7 @@ server {
   add_header X-Frame-Options "DENY";
   add_header X-Content-Type-Options "nosniff";
   add_header Content-Security-Policy   "connect-src 'self' ${VITE_BACKEND_API_URL} ${VITE_SEGMENT_API_URL};
-                                        frame-src 'self' *.youtube.com *.wikipedia.org;
+                                        frame-src 'self' *.youtube.com *.wikipedia.org ${AUT0_DOMAIN};
                                         script-src 'self' 'unsafe-inline' https://accounts.google.com/gsi/client;
                                         default-src 'self' *.${VITE_FRONTEND_HOSTNAME} data:;
                                         style-src 'self' *.googleapis.com 'unsafe-inline';" always ;
diff --git a/frontend/package.json b/frontend/package.json
index cc23f21f6..77c6f32fb 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "neo4j-needle-starterkit",
+  "name": "neo4j-llm-graph-builder",
   "private": true,
   "version": "1.0.0",
   "type": "module",
@@ -26,7 +26,6 @@
     "axios": "^1.6.5",
     "clsx": "^2.1.1",
     "eslint-plugin-react": "^7.33.2",
-    "neo4j-driver": "^5.14.0",
     "re-resizable": "^6.9.16",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
diff --git a/frontend/src/API/Index.ts b/frontend/src/API/Index.ts
index d3144379e..d0a82e888 100644
--- a/frontend/src/API/Index.ts
+++ b/frontend/src/API/Index.ts
@@ -9,11 +9,21 @@ const api = axios.create({
 
 export const createDefaultFormData = (userCredentials: UserCredentials) => {
   const formData = new FormData();
-  if (userCredentials?.uri) formData.append('uri', userCredentials?.uri);
-  if (userCredentials?.database) formData.append('database', userCredentials?.database);
-  if (userCredentials?.userName) formData.append('userName', userCredentials?.userName);
-  if (userCredentials?.password) formData.append('password', userCredentials?.password);
-  if (userCredentials?.email) formData.append('email', userCredentials?.email);
+  if (userCredentials?.uri) {
+    formData.append('uri', userCredentials?.uri);
+  }
+  if (userCredentials?.database) {
+    formData.append('database', userCredentials?.database);
+  }
+  if (userCredentials?.userName) {
+    formData.append('userName', userCredentials?.userName);
+  }
+  if (userCredentials?.password) {
+    formData.append('password', userCredentials?.password);
+  }
+  if (userCredentials?.email) {
+    formData.append('email', userCredentials?.email);
+  }
   api.interceptors.request.use(
     (config) => {
       if (config.data instanceof FormData) {
diff --git a/frontend/src/components/ChatBot/ChatInfoModal.tsx b/frontend/src/components/ChatBot/ChatInfoModal.tsx
index d14c48be6..d547a36ec 100644
--- a/frontend/src/components/ChatBot/ChatInfoModal.tsx
+++ b/frontend/src/components/ChatBot/ChatInfoModal.tsx
@@ -107,7 +107,6 @@ const ChatInfoModal: React.FC<chatInfoMessage> = ({
         ? false
         : null
   );
-
   const actions: React.ComponentProps<typeof IconButton<'button'>>[] = useMemo(
     () => [
       {
@@ -132,6 +131,7 @@ const ChatInfoModal: React.FC<chatInfoMessage> = ({
   );
 
   useEffect(() => {
+    const abortcontroller = new AbortController();
     if (
       (mode != chatModeLables.graph || error?.trim() !== '') &&
       (!nodes.length || !infoEntities.length || !chunks.length)
@@ -139,11 +139,7 @@ const ChatInfoModal: React.FC<chatInfoMessage> = ({
       (async () => {
         toggleInfoLoading();
         try {
-          const response = await chunkEntitiesAPI(
-            nodeDetails,
-            entities_ids,
-            mode,
-          );
+          const response = await chunkEntitiesAPI(nodeDetails, entities_ids, mode, abortcontroller.signal);
           if (response.data.status === 'Failure') {
             throw new Error(response.data.error);
           }
@@ -195,6 +191,7 @@ const ChatInfoModal: React.FC<chatInfoMessage> = ({
       if (metricsLoading) {
         toggleMetricsLoading();
       }
+      abortcontroller.abort();
     };
   }, [nodeDetails, mode, error, metricsLoading]);
 
diff --git a/frontend/src/components/ChatBot/ChatOnlyComponent.tsx b/frontend/src/components/ChatBot/ChatOnlyComponent.tsx
index 33ee19bd9..323fdf2dd 100644
--- a/frontend/src/components/ChatBot/ChatOnlyComponent.tsx
+++ b/frontend/src/components/ChatBot/ChatOnlyComponent.tsx
@@ -43,8 +43,7 @@ const ChatContent: React.FC<ChatProps> = ({ chatMessages }) => {
       } else {
         setOpenConnection((prev) => ({ ...prev, openPopUp: true }));
       }
-    }
-    else {
+    } else {
       const credentialsForAPI: UserCredentials = {
         uri,
         userName: user,
diff --git a/frontend/src/components/Content.tsx b/frontend/src/components/Content.tsx
index 93c9e42ab..62964cb93 100644
--- a/frontend/src/components/Content.tsx
+++ b/frontend/src/components/Content.tsx
@@ -72,6 +72,7 @@ const Content: React.FC<ContentProps> = ({
   const [currentPage, setCurrentPage] = useState<number>(0);
   const [totalPageCount, setTotalPageCount] = useState<number | null>(null);
   const [textChunks, setTextChunks] = useState<chunkdata[]>([]);
+  const chunksTextAbortController = useRef<AbortController>();
 
   const [alertStateForRetry, setAlertStateForRetry] = useState<BannerAlertProps>({
     showAlert: false,
@@ -103,9 +104,9 @@ const Content: React.FC<ContentProps> = ({
     additionalInstructions,
     setAdditionalInstructions,
   } = useFileContext();
-  const [viewPoint, setViewPoint] = useState<'tableView' | 'showGraphView' | 'chatInfoView' | 'neighborView'|'showSchemaView'>(
-    'tableView'
-  );
+  const [viewPoint, setViewPoint] = useState<
+    'tableView' | 'showGraphView' | 'chatInfoView' | 'neighborView' | 'showSchemaView'
+  >('tableView');
   const [showDeletePopUp, setShowDeletePopUp] = useState<boolean>(false);
   const [deleteLoading, setIsDeleteLoading] = useState<boolean>(false);
 
@@ -221,8 +222,9 @@ const Content: React.FC<ContentProps> = ({
     });
   };
   const getChunks = async (name: string, pageNo: number) => {
+    chunksTextAbortController.current = new AbortController();
     toggleChunksLoading();
-    const response = await getChunkText(name, pageNo);
+    const response = await getChunkText(name, pageNo, chunksTextAbortController.current.signal);
     setTextChunks(response.data.data.pageitems);
     if (!totalPageCount) {
       setTotalPageCount(response.data.data.total_pages);
@@ -271,11 +273,7 @@ const Content: React.FC<ContentProps> = ({
       });
       if (fileItem.name != undefined && userCredentials != null) {
         const { name } = fileItem;
-        triggerStatusUpdateAPI(
-          name as string,
-          userCredentials,
-          updateStatusForLargeFiles
-        );
+        triggerStatusUpdateAPI(name as string, userCredentials, updateStatusForLargeFiles);
       }
 
       const apiResponse = await extractAPI(
@@ -544,12 +542,14 @@ const Content: React.FC<ContentProps> = ({
     let finalUrl = bloomUrl;
     if (userCredentials?.database && userCredentials.uri && userCredentials.userName) {
       const uriCoded = userCredentials.uri.replace(/:\d+$/, '');
-      const connectURL = `${uriCoded.split('//')[0]}//${userCredentials.userName}@${uriCoded.split('//')[1]}:${userCredentials.port ?? '7687'}`;
+      const connectURL = `${uriCoded.split('//')[0]}//${userCredentials.userName}@${uriCoded.split('//')[1]}:${
+        userCredentials.port ?? '7687'
+      }`;
       const encodedURL = encodeURIComponent(connectURL);
       finalUrl = bloomUrl?.replace('{CONNECT_URL}', encodedURL);
     }
     window.open(finalUrl, '_blank');
-   };
+  };
 
   const handleGraphView = () => {
     setOpenGraphView(true);
@@ -855,7 +855,10 @@ const Content: React.FC<ContentProps> = ({
       {showChunkPopup && (
         <ChunkPopUp
           chunksLoading={chunksLoading}
-          onClose={() => toggleChunkPopup()}
+          onClose={() => {
+            chunksTextAbortController.current?.abort();
+            toggleChunkPopup();
+          }}
           showChunkPopup={showChunkPopup}
           chunks={textChunks}
           incrementPage={incrementPage}
@@ -885,11 +888,7 @@ const Content: React.FC<ContentProps> = ({
           <div className='connectionstatus__container'>
             <span className='h6 px-1'>Neo4j connection {isReadOnlyUser ? '(Read only Mode)' : ''}</span>
             <Typography variant='body-medium'>
-              <DatabaseStatusIcon
-                isConnected={connectionStatus}
-                isGdsActive={isGdsActive}
-                uri={userCredentials?.uri}
-              />
+              <DatabaseStatusIcon isConnected={connectionStatus} isGdsActive={isGdsActive} uri={userCredentials?.uri} />
               <div className='pt-1 flex gap-1 items-center'>
                 <div>{!hasSelections ? <StatusIndicator type='danger' /> : <StatusIndicator type='success' />}</div>
                 <div>
diff --git a/frontend/src/components/Dropdown.tsx b/frontend/src/components/Dropdown.tsx
index 2782addd9..9570ee127 100644
--- a/frontend/src/components/Dropdown.tsx
+++ b/frontend/src/components/Dropdown.tsx
@@ -3,6 +3,8 @@ import { OptionType, ReusableDropdownProps } from '../types';
 import { memo, useMemo } from 'react';
 import { capitalize, capitalizeWithUnderscore } from '../utils/Utils';
 import { prodllms } from '../utils/Constants';
+import { InformationCircleIconOutline } from '@neo4j-ndl/react/icons';
+
 const DropdownComponent: React.FC<ReusableDropdownProps> = ({
   options,
   placeholder,
@@ -29,7 +31,14 @@ const DropdownComponent: React.FC<ReusableDropdownProps> = ({
         <Select
           type='select'
           label='LLM Models'
-          helpText={<div className='!w-max'> LLM Model used for Extraction & Chat</div>}
+          helpText={
+            <div className='!w-max flex gap-1 items-center'>
+              <span>
+                <InformationCircleIconOutline title='info' aria-label='infoicon' className='n-size-token-6' />
+              </span>
+              <span>LLM Model used for Extraction & Chat</span>
+            </div>
+          }
           selectProps={{
             onChange: handleChange,
             // @ts-ignore
diff --git a/frontend/src/components/FileTable.tsx b/frontend/src/components/FileTable.tsx
index 534d588fb..4c5fafe9e 100644
--- a/frontend/src/components/FileTable.tsx
+++ b/frontend/src/components/FileTable.tsx
@@ -683,20 +683,11 @@ const FileTable: ForwardRefRenderFunction<ChildRef, FileTableProps> = (props, re
   };
 
   const handleSmallFile = (item: SourceNode, userCredentials: UserCredentials) => {
-    subscribe(
-      item.fileName,
-      userCredentials,
-      updatestatus,
-      updateProgress
-    ).catch(handleFileUploadError);
+    subscribe(item.fileName, userCredentials, updatestatus, updateProgress).catch(handleFileUploadError);
   };
 
   const handleLargeFile = (item: SourceNode, userCredentials: UserCredentials) => {
-    triggerStatusUpdateAPI(
-      item.fileName,
-      userCredentials,
-      updateStatusForLargeFiles
-    );
+    triggerStatusUpdateAPI(item.fileName, userCredentials, updateStatusForLargeFiles);
   };
   useEffect(() => {
     const waitingQueue: CustomFile[] = JSON.parse(
diff --git a/frontend/src/components/Graph/GraphViewModal.tsx b/frontend/src/components/Graph/GraphViewModal.tsx
index 05d1f1897..7f1bf79b8 100644
--- a/frontend/src/components/Graph/GraphViewModal.tsx
+++ b/frontend/src/components/Graph/GraphViewModal.tsx
@@ -58,6 +58,7 @@ const GraphViewModal: React.FunctionComponent<GraphViewModalProps> = ({
   const [disableRefresh, setDisableRefresh] = useState<boolean>(false);
   const [selected, setSelected] = useState<{ type: EntityType; id: string } | undefined>(undefined);
   const [mode, setMode] = useState<boolean>(false);
+  const graphQueryAbortControllerRef = useRef<AbortController>();
 
   const graphQuery: string =
     graphType.includes('DocumentChunk') && graphType.includes('Entities')
@@ -109,17 +110,23 @@ const GraphViewModal: React.FunctionComponent<GraphViewModalProps> = ({
   }, [allNodes]);
 
   const fetchData = useCallback(async () => {
+    graphQueryAbortControllerRef.current = new AbortController();
     try {
       let nodeRelationshipData;
       if (viewPoint === graphLabels.showGraphView) {
         nodeRelationshipData = await graphQueryAPI(
           graphQuery,
-          selectedRows?.map((f) => f.name)
+          selectedRows?.map((f) => f.name),
+          graphQueryAbortControllerRef.current.signal
         );
       } else if (viewPoint === graphLabels.showSchemaView) {
         nodeRelationshipData = await getGraphSchema();
       } else {
-        nodeRelationshipData = await graphQueryAPI(graphQuery, [inspectedName ?? '']);
+        nodeRelationshipData = await graphQueryAPI(
+          graphQuery,
+          [inspectedName ?? ''],
+          graphQueryAbortControllerRef.current.signal
+        );
       }
       return nodeRelationshipData;
     } catch (error: any) {
@@ -310,6 +317,7 @@ const GraphViewModal: React.FunctionComponent<GraphViewModalProps> = ({
 
   // when modal closes reset all states to default
   const onClose = () => {
+    graphQueryAbortControllerRef?.current?.abort();
     setStatus('unknown');
     setStatusMessage('');
     setGraphViewOpen(false);
diff --git a/frontend/src/components/Layout/PageLayout.tsx b/frontend/src/components/Layout/PageLayout.tsx
index 0978a51b5..bc65f2b0e 100644
--- a/frontend/src/components/Layout/PageLayout.tsx
+++ b/frontend/src/components/Layout/PageLayout.tsx
@@ -115,7 +115,7 @@ const PageLayout: React.FC = () => {
             email: user?.email ?? '',
             connection: 'backendApi',
           };
-          //setChunksToBeProces(credentials.chunksTobeProcess);
+          // setChunksToBeProces(credentials.chunksTobeProcess);
           setIsGCSActive(credentials.isGCSActive);
           setUserCredentials(credentials);
           createDefaultFormData({ uri: credentials.uri, email: credentials.email ?? '' });
@@ -123,14 +123,13 @@ const PageLayout: React.FC = () => {
           setConnectionStatus(Boolean(connectionData.data.graph_connection));
           setIsReadOnlyUser(connectionData.data.isReadonlyUser);
           handleDisconnectButtonState(false);
-        }
-        else if (!connectionData.data && connectionData.status === 'Success') {
+        } else if (!connectionData.data && connectionData.status === 'Success') {
           const storedCredentials = localStorage.getItem('neo4j.connection');
           if (storedCredentials) {
             const credentials = JSON.parse(storedCredentials);
             setUserCredentials({ ...credentials, password: atob(credentials.password) });
             createDefaultFormData({ ...credentials, password: atob(credentials.password) });
-            //setChunksToBeProces(credentials.chunksTobeProcess);
+            // setChunksToBeProces(credentials.chunksTobeProcess);
             setIsGCSActive(credentials.isGCSActive);
             setGdsActive(credentials.isgdsActive);
             setConnectionStatus(Boolean(credentials.connection === 'connectAPI'));
@@ -144,7 +143,7 @@ const PageLayout: React.FC = () => {
           setErrorMessage(backendApiResponse?.data?.error);
           setOpenConnection((prev) => ({ ...prev, openPopUp: true }));
           handleDisconnectButtonState(true);
-          console.log('from else cndition error is there')
+          console.log('from else cndition error is there');
         }
       } catch (error) {
         if (error instanceof Error) {
@@ -160,9 +159,7 @@ const PageLayout: React.FC = () => {
       setClearHistoryData(true);
       setIsDeleteChatLoading(true);
       cancel();
-      const response = await clearChatAPI(
-        sessionStorage.getItem('session_id') ?? ''
-      );
+      const response = await clearChatAPI(sessionStorage.getItem('session_id') ?? '');
       setIsDeleteChatLoading(false);
       if (response.data.status === 'Success') {
         const date = new Date();
diff --git a/frontend/src/components/Popups/ConnectionModal/ConnectionModal.tsx b/frontend/src/components/Popups/ConnectionModal/ConnectionModal.tsx
index 173da1e2d..6a6e9d237 100644
--- a/frontend/src/components/Popups/ConnectionModal/ConnectionModal.tsx
+++ b/frontend/src/components/Popups/ConnectionModal/ConnectionModal.tsx
@@ -255,7 +255,7 @@ export default function ConnectionModal({
             isGCSActive,
             chunksTobeProcess,
             email: user?.email ?? '',
-            connection:'connectAPI',
+            connection: 'connectAPI',
           })
         );
         setUserDbVectorIndex(response.data.data.db_vector_dimension);
diff --git a/frontend/src/components/Popups/GraphEnhancementDialog/Deduplication/index.tsx b/frontend/src/components/Popups/GraphEnhancementDialog/Deduplication/index.tsx
index ad21c715f..4701b926a 100644
--- a/frontend/src/components/Popups/GraphEnhancementDialog/Deduplication/index.tsx
+++ b/frontend/src/components/Popups/GraphEnhancementDialog/Deduplication/index.tsx
@@ -48,11 +48,12 @@ export default function DeduplicationTab() {
   const [viewPoint, setViewPoint] = useState('');
   const [nodesCount, setNodesCount] = useState<number>(0);
   const { colorMode } = useContext(ThemeWrapperContext);
+  const abortRef = useRef<AbortController>();
 
   const fetchDuplicateNodes = useCallback(async () => {
     try {
       setLoading(true);
-      const duplicateNodesData = await getDuplicateNodes();
+      const duplicateNodesData = await getDuplicateNodes(abortRef?.current?.signal as AbortSignal);
       setLoading(false);
       if (duplicateNodesData.data.status === 'Failed') {
         throw new Error(duplicateNodesData.data.error);
@@ -71,11 +72,15 @@ export default function DeduplicationTab() {
   }, [userCredentials]);
 
   useEffect(() => {
+    abortRef.current = new AbortController();
     if (userCredentials != null) {
       (async () => {
         await fetchDuplicateNodes();
       })();
     }
+    return () => {
+      abortRef.current?.abort();
+    };
   }, [userCredentials]);
 
   const clickHandler = async () => {
diff --git a/frontend/src/components/Popups/GraphEnhancementDialog/DeleteTabForOrphanNodes/index.tsx b/frontend/src/components/Popups/GraphEnhancementDialog/DeleteTabForOrphanNodes/index.tsx
index 6b8b1fb9b..b4e160701 100644
--- a/frontend/src/components/Popups/GraphEnhancementDialog/DeleteTabForOrphanNodes/index.tsx
+++ b/frontend/src/components/Popups/GraphEnhancementDialog/DeleteTabForOrphanNodes/index.tsx
@@ -44,11 +44,11 @@ export default function DeletePopUpForOrphanNodes({
   const [openGraphView, setOpenGraphView] = useState(false);
   const [viewPoint, setViewPoint] = useState('');
   const { colorMode } = useContext(ThemeWrapperContext);
-
+  const ref = useRef<AbortController>();
   const fetchOrphanNodes = useCallback(async () => {
     try {
       setLoading(true);
-      const apiresponse = await getOrphanNodes();
+      const apiresponse = await getOrphanNodes(ref.current?.signal as AbortSignal);
       setLoading(false);
       if (apiresponse.data.data.length) {
         setOrphanNodes(apiresponse.data.data);
@@ -65,6 +65,7 @@ export default function DeletePopUpForOrphanNodes({
   }, []);
 
   useEffect(() => {
+    ref.current = new AbortController();
     if (userCredentials != null) {
       (async () => {
         await fetchOrphanNodes();
@@ -73,6 +74,7 @@ export default function DeletePopUpForOrphanNodes({
     return () => {
       setOrphanNodes([]);
       setTotalOrphanNodes(0);
+      ref?.current?.abort();
     };
   }, [userCredentials]);
   const columnHelper = createColumnHelper<orphanNodeProps>();
diff --git a/frontend/src/services/ChunkEntitiesInfo.ts b/frontend/src/services/ChunkEntitiesInfo.ts
index 3bef3f491..65b92fac2 100644
--- a/frontend/src/services/ChunkEntitiesInfo.ts
+++ b/frontend/src/services/ChunkEntitiesInfo.ts
@@ -5,6 +5,7 @@ const chunkEntitiesAPI = async (
   nodeDetails: nodeDetailsProps,
   entities: string[],
   mode: string,
+  signal: AbortSignal
 ) => {
   try {
     const formData = new FormData();
@@ -16,6 +17,7 @@ const chunkEntitiesAPI = async (
       headers: {
         'Content-Type': 'multipart/form-data',
       },
+      signal,
     });
     return response;
   } catch (error) {
diff --git a/frontend/src/services/GetDuplicateNodes.ts b/frontend/src/services/GetDuplicateNodes.ts
index 02ad3240d..ea9d6f25a 100644
--- a/frontend/src/services/GetDuplicateNodes.ts
+++ b/frontend/src/services/GetDuplicateNodes.ts
@@ -1,10 +1,10 @@
 import { duplicateNodesData } from '../types';
 import api from '../API/Index';
 
-export const getDuplicateNodes = async () => {
+export const getDuplicateNodes = async (signal: AbortSignal) => {
   const formData = new FormData();
   try {
-    const response = await api.post<duplicateNodesData>(`/get_duplicate_nodes`, formData);
+    const response = await api.post<duplicateNodesData>(`/get_duplicate_nodes`, formData, { signal });
     return response;
   } catch (error) {
     console.log(error);
diff --git a/frontend/src/services/GetFiles.ts b/frontend/src/services/GetFiles.ts
index 328be9d9e..a076476e3 100644
--- a/frontend/src/services/GetFiles.ts
+++ b/frontend/src/services/GetFiles.ts
@@ -3,11 +3,21 @@ import api from '../API/Index';
 export const getSourceNodes = async (userCredentials: UserCredentials) => {
   try {
     const params = new URLSearchParams();
-    if (userCredentials.uri) params.append("uri", userCredentials.uri);
-    if (userCredentials.database) params.append("database", userCredentials.database);
-    if (userCredentials.userName) params.append("userName", userCredentials.userName);
-    if (userCredentials.password) params.append("password", btoa(userCredentials.password));
-    if (userCredentials.email) params.append("email", userCredentials.email);
+    if (userCredentials.uri) {
+      params.append('uri', userCredentials.uri);
+    }
+    if (userCredentials.database) {
+      params.append('database', userCredentials.database);
+    }
+    if (userCredentials.userName) {
+      params.append('userName', userCredentials.userName);
+    }
+    if (userCredentials.password) {
+      params.append('password', btoa(userCredentials.password));
+    }
+    if (userCredentials.email) {
+      params.append('email', userCredentials.email);
+    }
     const response = await api.get<SourceListServerData>(`/sources_list?${params.toString()}`);
     return response;
   } catch (error) {
diff --git a/frontend/src/services/GetOrphanNodes.ts b/frontend/src/services/GetOrphanNodes.ts
index e49f40ab9..19e86a0b9 100644
--- a/frontend/src/services/GetOrphanNodes.ts
+++ b/frontend/src/services/GetOrphanNodes.ts
@@ -1,10 +1,10 @@
 import { OrphanNodeResponse } from '../types';
 import api from '../API/Index';
 
-export const getOrphanNodes = async () => {
+export const getOrphanNodes = async (signal: AbortSignal) => {
   const formData = new FormData();
   try {
-    const response = await api.post<OrphanNodeResponse>(`/get_unconnected_nodes_list`, formData);
+    const response = await api.post<OrphanNodeResponse>(`/get_unconnected_nodes_list`, formData, { signal });
     return response;
   } catch (error) {
     console.log(error);
diff --git a/frontend/src/services/GraphQuery.ts b/frontend/src/services/GraphQuery.ts
index c6d0711fb..9833e08e9 100644
--- a/frontend/src/services/GraphQuery.ts
+++ b/frontend/src/services/GraphQuery.ts
@@ -1,6 +1,10 @@
 import api from '../API/Index';
 
-export const graphQueryAPI = async (query_type: string, document_names: (string | undefined)[] | undefined) => {
+export const graphQueryAPI = async (
+  query_type: string,
+  document_names: (string | undefined)[] | undefined,
+  signal: AbortSignal
+) => {
   try {
     const formData = new FormData();
     formData.append('query_type', query_type ?? 'entities');
@@ -10,6 +14,7 @@ export const graphQueryAPI = async (query_type: string, document_names: (string
       headers: {
         'Content-Type': 'multipart/form-data',
       },
+      signal,
     });
     return response;
   } catch (error) {
diff --git a/frontend/src/services/PollingAPI.ts b/frontend/src/services/PollingAPI.ts
index 2aa0b999c..caf933f38 100644
--- a/frontend/src/services/PollingAPI.ts
+++ b/frontend/src/services/PollingAPI.ts
@@ -11,10 +11,18 @@ export default async function subscribe(
   let delay = 1000;
   // Build query parameters conditionally
   const queryParams = new URLSearchParams();
-  if (userCredentials.uri) queryParams.append('url', userCredentials.uri);
-  if (userCredentials.userName) queryParams.append('userName', userCredentials.userName);
-  if (userCredentials.password) queryParams.append('password', userCredentials.password);
-  if (userCredentials.database) queryParams.append('database', userCredentials.database);
+  if (userCredentials.uri) {
+    queryParams.append('url', userCredentials.uri);
+  }
+  if (userCredentials.userName) {
+    queryParams.append('userName', userCredentials.userName);
+  }
+  if (userCredentials.password) {
+    queryParams.append('password', userCredentials.password);
+  }
+  if (userCredentials.database) {
+    queryParams.append('database', userCredentials.database);
+  }
   while (pollingAttempts < MAX_POLLING_ATTEMPTS) {
     let currentDelay = delay;
     const response: PollingAPI_Response = await api.get(`/document_status/${fileName}?${queryParams.toString()}`);
diff --git a/frontend/src/services/ServerSideStatusUpdateAPI.ts b/frontend/src/services/ServerSideStatusUpdateAPI.ts
index ecd0f826c..1048d83d4 100644
--- a/frontend/src/services/ServerSideStatusUpdateAPI.ts
+++ b/frontend/src/services/ServerSideStatusUpdateAPI.ts
@@ -6,10 +6,18 @@ export function triggerStatusUpdateAPI(
   datahandler: (i: eventResponsetypes) => void
 ) {
   const params = new URLSearchParams();
-  if (userCredentials.uri) params.append("uri", userCredentials.uri);
-  if (userCredentials.database) params.append("database", userCredentials.database);
-  if (userCredentials.userName) params.append("userName", userCredentials.userName);
-  if (userCredentials.password) params.append("password", btoa(userCredentials.password));
+  if (userCredentials.uri) {
+    params.append('uri', userCredentials.uri);
+  }
+  if (userCredentials.database) {
+    params.append('database', userCredentials.database);
+  }
+  if (userCredentials.userName) {
+    params.append('userName', userCredentials.userName);
+  }
+  if (userCredentials.password) {
+    params.append('password', btoa(userCredentials.password));
+  }
   const queryString = params.toString();
   const requestUrl = queryString
     ? `${url()}/update_extract_status/${name}?${queryString}`
diff --git a/frontend/src/services/getChunkText.ts b/frontend/src/services/getChunkText.ts
index 7e3d2fa7b..c73078b00 100644
--- a/frontend/src/services/getChunkText.ts
+++ b/frontend/src/services/getChunkText.ts
@@ -1,12 +1,12 @@
 import { chunksData } from '../types';
 import api from '../API/Index';
 
-export const getChunkText = async (documentName: string, page_no: number) => {
+export const getChunkText = async (documentName: string, page_no: number, signal: AbortSignal) => {
   const formData = new FormData();
   formData.append('document_name', documentName);
   formData.append('page_no', page_no.toString());
   try {
-    const response = await api.post<chunksData>(`/fetch_chunktext`, formData);
+    const response = await api.post<chunksData>(`/fetch_chunktext`, formData, { signal });
     return response;
   } catch (error) {
     console.log(error);
diff --git a/frontend/src/types.ts b/frontend/src/types.ts
index f99b744d0..de26fbfd1 100644
--- a/frontend/src/types.ts
+++ b/frontend/src/types.ts
@@ -48,11 +48,11 @@ export interface OptionType {
 
 export type UserCredentials = {
   uri?: string;
-  userName?: string
-  password?: string
-  database?: string
+  userName?: string;
+  password?: string;
+  database?: string;
   email: string;
-  connection?: string
+  connection?: string;
 } & { [key: string]: any };
 
 export interface SourceNode extends Omit<CustomFileBase, 'relationshipsCount' | 'createdAt'> {
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index 3e5573e8d..ece32b70b 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -2502,11 +2502,6 @@ balanced-match@^1.0.0:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
-base64-js@^1.3.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
-  integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
-
 bin-pack@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/bin-pack/-/bin-pack-1.0.2.tgz#c2a014edbf0bed70a3292062ed46577b96120679"
@@ -2549,14 +2544,6 @@ browserslist@^4.23.1, browserslist@^4.23.3:
     node-releases "^2.0.18"
     update-browserslist-db "^1.1.0"
 
-buffer@^6.0.3:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6"
-  integrity sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==
-  dependencies:
-    base64-js "^1.3.1"
-    ieee754 "^1.2.1"
-
 call-bind@^1.0.2, call-bind@^1.0.5, call-bind@^1.0.6, call-bind@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.7.tgz#06016599c40c56498c18769d2730be242b6fa3b9"
@@ -3757,11 +3744,6 @@ hyphenate-style-name@^1.0.3:
   resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.1.0.tgz#1797bf50369588b47b72ca6d5e65374607cf4436"
   integrity sha512-WDC/ui2VVRrz3jOVi+XtjqkDjiVjTtFaAGiW37k6b+ohyQ5wYDOGkvCZa8+H0nx3gyvv0+BST9xuOgIyGQ00gw==
 
-ieee754@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
-  integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
-
 ignore@^5.2.0, ignore@^5.2.4:
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.1.tgz#5073e554cd42c5b33b394375f538b8593e34d4ef"
@@ -4666,29 +4648,6 @@ natural-compare@^1.4.0:
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
 
-neo4j-driver-bolt-connection@5.23.0:
-  version "5.23.0"
-  resolved "https://registry.yarnpkg.com/neo4j-driver-bolt-connection/-/neo4j-driver-bolt-connection-5.23.0.tgz#2d3e988d3f9f1f0eef92c5a8533923af7036ae87"
-  integrity sha512-d8aLeeS33KMmUnGCGj/U07AUOch8IVc6hA8Lit/4ExaHnhRoSgEOPAK6/RAbYAfABlVqFfErtV85s1OnrJu64g==
-  dependencies:
-    buffer "^6.0.3"
-    neo4j-driver-core "5.23.0"
-    string_decoder "^1.3.0"
-
-neo4j-driver-core@5.23.0:
-  version "5.23.0"
-  resolved "https://registry.yarnpkg.com/neo4j-driver-core/-/neo4j-driver-core-5.23.0.tgz#8de25804c50a35cdbc7370de4a833ba63fe8453d"
-  integrity sha512-kypv0cym8vB9t36MRKSt/mtNZuvCACg6S47yJMDjJx5XSWx69QbBaLNvoa/2//7NPCCj0Fn0i5HCKqBkcBRa2Q==
-
-neo4j-driver@^5.14.0:
-  version "5.23.0"
-  resolved "https://registry.yarnpkg.com/neo4j-driver/-/neo4j-driver-5.23.0.tgz#fd13a5e5dcd1dc74e4778d2f34a6a6e8b91ab4f4"
-  integrity sha512-jqAyvIIpD1dl0+GuSXfF7Hzy+bscBIRvO2hrMqQji4Gq2baBaRMcsG/8CRhkF7Hm1bUeBUnnArnUNUGO/c+kow==
-  dependencies:
-    neo4j-driver-bolt-connection "5.23.0"
-    neo4j-driver-core "5.23.0"
-    rxjs "^7.8.1"
-
 new-date@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/new-date/-/new-date-1.0.3.tgz#a5956086d3f5ed43d0b210d87a10219ccb7a2326"
@@ -5468,13 +5427,6 @@ run-parallel@^1.1.9:
   dependencies:
     queue-microtask "^1.2.2"
 
-rxjs@^7.8.1:
-  version "7.8.1"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543"
-  integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==
-  dependencies:
-    tslib "^2.1.0"
-
 safe-array-concat@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.1.2.tgz#81d77ee0c4e8b863635227c721278dd524c20edb"
@@ -5485,11 +5437,6 @@ safe-array-concat@^1.1.2:
     has-symbols "^1.0.3"
     isarray "^2.0.5"
 
-safe-buffer@~5.2.0:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
-  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
-
 safe-regex-test@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.3.tgz#a5b4c0f06e0ab50ea2c395c14d8371232924c377"
@@ -5732,13 +5679,6 @@ string.prototype.trimstart@^1.0.8:
     define-properties "^1.2.1"
     es-object-atoms "^1.0.0"
 
-string_decoder@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
-  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
-  dependencies:
-    safe-buffer "~5.2.0"
-
 string_decoder@~0.10.x:
   version "0.10.31"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"