diff --git a/src/components/Header/SubHeader.tsx b/src/components/Header/SubHeader.tsx
index 765933bc..c713113e 100644
--- a/src/components/Header/SubHeader.tsx
+++ b/src/components/Header/SubHeader.tsx
@@ -132,7 +132,7 @@ const RefreshNow: FC = () => {
 	} = useHeaderContext();
 
 	const onRefresh = () => {
-		if (subLogSelectedTimeRange.get().includes('Past')) {
+		if (subLogSelectedTimeRange.get().includes('last')) {
 			const now = dayjs();
 			const timeDiff = subLogQuery.get().endTime.getTime() - subLogQuery.get().startTime.getTime();
 			subLogQuery.set((state) => {
diff --git a/src/components/Navbar/index.tsx b/src/components/Navbar/index.tsx
index 496d4f1c..89e538f0 100644
--- a/src/components/Navbar/index.tsx
+++ b/src/components/Navbar/index.tsx
@@ -1,9 +1,20 @@
 import type { NavbarProps as MantineNavbarProps } from '@mantine/core';
-import { Navbar as MantineNavbar, NavLink, Select, Anchor, Card, Box, Modal, Text, Image, Button, TextInput } from '@mantine/core';
+import {
+	Navbar as MantineNavbar,
+	NavLink,
+	Select,
+	Anchor,
+	Card,
+	Box,
+	Modal,
+	Text,
+	Image,
+	Button,
+	TextInput,
+} from '@mantine/core';
 import {
 	IconZoomCode,
 	IconReportAnalytics,
-	IconCheck,
 	IconFileAlert,
 	IconReload,
 	IconHelpCircle,
@@ -14,12 +25,12 @@ import {
 	IconSettings,
 	IconTrash,
 } from '@tabler/icons-react';
-import { FC, useEffect, useState } from 'react';
+import { FC, useEffect } from 'react';
 import docImage from '@/assets/images/doc.webp';
 import githubLogo from '@/assets/images/github-logo.webp';
 import slackLogo from '@/assets/images/slack-logo.webp';
 import { useNavbarStyles } from './styles';
-import { useLocation, useParams } from 'react-router-dom';
+import { useParams } from 'react-router-dom';
 import { useGetLogStreamList } from '@/hooks/useGetLogStreamList';
 import { notifications } from '@mantine/notifications';
 import { useNavigate } from 'react-router-dom';
@@ -40,39 +51,30 @@ const links = [
 type NavbarProps = Omit<MantineNavbarProps, 'children'>;
 
 const Navbar: FC<NavbarProps> = (props) => {
-	const [username] = useLocalStorage({ key: 'username', getInitialValueInEffect: false });
 	const navigate = useNavigate();
-	const { data: streams, loading, error, getData, resetData:resetStreamArray} = useGetLogStreamList();
-	const [activeStream, setActiveStream] = useState('');
-	const [searchValue, setSearchValue] = useState('');
-	const { classes } = useNavbarStyles();
-	const [currentPage, setCurrentPage] = useState('/logs');
-	const [opened, { open, close }] = useDisclosure(false);
-	const [ deleteStream, setDeleteStream] = useState('');
-	const [disableLink, setDisableLink] = useState(false);
-	const {
-		container,
-		linkBtnActive,
-		linkBtn,
-		selectStreambtn,
-		streamsBtn,
-		lowerContainer,
-		actionBtn,
-		helpTitle,
-		helpDescription,
-		userBtn,
-	} = classes;
 	const { streamName } = useParams();
-	const nav = useNavigate();
+	
+	const [username] = useLocalStorage({ key: 'username', getInitialValueInEffect: false });
 	const [, , removeCredentials] = useLocalStorage({ key: 'credentials' });
 	const [, , removeUsername] = useLocalStorage({ key: 'username' });
+	
+	
 	const {
 		state: { subNavbarTogle },
 	} = useHeaderContext();
+
+	const [activeStream, setActiveStream] = useMountedState('');
+	const [searchValue, setSearchValue] = useMountedState('');
+	const [currentPage, setCurrentPage] = useMountedState('/query');
+	const [deleteStream, setDeleteStream] = useMountedState('');
+
+	const [disableLink, setDisableLink] = useMountedState(false);
 	const [isSubNavbarOpen, setIsSubNavbarOpen] = useMountedState(false);
-	const [openedDelete, { close:closeDelete, open:openDelete}] = useDisclosure();
-	let location = useLocation();
-	const {data:deleteData, loading:deleteLoading, error:deleteError, deleteLogStreamFun , resetData: resetDeleteStraeam} = useDeleteLogStream();
+	const [opened, { open, close }] = useDisclosure(false);
+	const [openedDelete, { close: closeDelete, open: openDelete }] = useDisclosure();
+
+	const { data: streams, error, getData, resetData: resetStreamArray } = useGetLogStreamList();
+	const { data: deleteData, deleteLogStreamFun } = useDeleteLogStream();
 
 	useEffect(() => {
 		const listener = subNavbarTogle.subscribe(setIsSubNavbarOpen);
@@ -84,7 +86,7 @@ const Navbar: FC<NavbarProps> = (props) => {
 	const onSignOut = () => {
 		removeCredentials();
 		removeUsername();
-		nav(
+		navigate(
 			{
 				pathname: LOGIN_ROUTE,
 			},
@@ -97,159 +99,89 @@ const Navbar: FC<NavbarProps> = (props) => {
 	} = useHeaderContext();
 
 	useEffect(() => {
-		if(streams && streams.length!==0 && !streams.find((stream)=>stream.name===streamName)&& streamName && streamName===deleteStream){
-			
-			navigate(`/${streams[0].name}/query`);
-			return;
-		}
-		else if(streamName&&streams && streams.length!==0 && !streams.find((stream)=>stream.name===streamName) ){
-			notifications.show({
-				id: 'error-data',
-				color: 'red',
-				title: 'Error Occured',
-				message: `${streamName} stream not found`,
-				icon: <IconFileAlert size="1rem" />,
-				autoClose: 5000,
-			});
-			
-			navigate(`/${streams[0].name}/query`);
-			return;
+		if (streams && streams.length === 0) {
+			setActiveStream('');
+			setSearchValue('');
+			setDisableLink(true);
+			navigate(`/`);
 		}
-		else if (streamName && streams?.length!==0 && streams?.find((stream)=>stream.name===streamName)) {
-			setActiveStream(streamName);
-			setSearchValue(streamName);
-				const now = dayjs();
-				subLogQuery.set((state) => {
-					state.streamName = streamName || '';
-					state.startTime = now.subtract(DEFAULT_FIXED_DURATIONS.milliseconds, 'milliseconds').toDate();
-					state.endTime = now.toDate();
-				});
-				subLogSelectedTimeRange.set(DEFAULT_FIXED_DURATIONS.name);
-				subLogSearch.set((state) => {
-					state.search = '';
-					state.filters = {};
+		else if (streamName) {
+			if (streamName === deleteStream && streams) {
+				setDeleteStream('');
+				handleChange(streams[0].name);
+			} else if (streams && !streams.find((stream) => stream.name === streamName)) {
+				notifications.show({
+					id: 'error-data',
+					color: 'red',
+					title: 'Error Occured',
+					message: `${streamName} stream not found`,
+					icon: <IconFileAlert size="1rem" />,
+					autoClose: 5000,
 				});
-				subRefreshInterval.set(null);
+				handleChange(streams[0].name);
+			} else if (streams?.find((stream) => stream.name === streamName)) {
+				handleChange(streamName);
+			}
 		} else if (streams && Boolean(streams.length)) {
-			navigate(`/${streams[0].name}/query`);
+			handleChange(streams[0].name);
 		}
-	}, [streams, location]);
+	}, [streams]);
 
 	const handleChange = (value: string) => {
 		setActiveStream(value);
 		setSearchValue(value);
+		const now = dayjs();
+		subLogQuery.set((state) => {
+			state.streamName = value || '';
+			state.startTime = now.subtract(DEFAULT_FIXED_DURATIONS.milliseconds, 'milliseconds').toDate();
+			state.endTime = now.toDate();
+		});
+		subLogSelectedTimeRange.set(DEFAULT_FIXED_DURATIONS.name);
+		subLogSearch.set((state) => {
+			state.search = '';
+			state.filters = {};
+		});
+		subRefreshInterval.set(null);
+		setDisableLink(false);
 		navigate(`/${value}${currentPage}`);
 	};
 
-	useEffect(() => {
-		if (loading) {
-			notifications.show({
-				id: 'load-data',
-				loading: true,
-				color: '#545BEB',
-				title: 'Fetching Streams',
-				message: 'Streams will be loaded.',
-				autoClose: false,
-				withCloseButton: false,
-			});
-		}
-		if (streams && Boolean(streams.length)) {
-			notifications.update({
-				id: 'load-data',
-				color: 'green',
-				title: 'Streams was loaded',
-				message: 'Successfully Loaded!!',
-				icon: <IconCheck size="1rem" />,
-				autoClose: 1000,
-			});
-		}
-		if (error) {
-			notifications.update({
-				id: 'load-data',
-				color: 'red',
-				title: 'Error Occured',
-				message: 'Error Occured while fetching streams',
-				icon: <IconFileAlert size="1rem" />,
-				autoClose: 2000,
-			});
-		}
-		if(streams && streams.length===0){
-			notifications.update({
-				id: 'load-data',
-				color: 'red',
-				title: 'No Streams',
-				message: 'No Streams Found in your account',
-				icon: <IconFileAlert size="1rem" />,
-				autoClose: 2000,
-			});
-			setActiveStream('');
-			setSearchValue('');
-			setDisableLink(true);
-			navigate(`/`);
-		}
-	}, [streams, error, loading]);
 	const handleCloseDelete = () => {
 		closeDelete();
 		setDeleteStream('');
 	};
+
 	const handleDelete = () => {
-		deleteLogStreamFun(deleteStream||"");
+		deleteLogStreamFun(deleteStream);
 		closeDelete();
 	};
 
 	useEffect(() => {
-		if (deleteLoading) {
-			notifications.show({
-				id: 'delete-data',
-				loading: true,
-				color: '#545BEB',
-				title: 'Deleting Stream',
-				message: 'Stream will be deleted.',
-				autoClose: false,
-				withCloseButton: false,
-
-			});
-			return;
-		}
-		if (deleteData && !deleteLoading) {
-			notifications.update({
-				id: 'delete-data',
-				color: 'green',
-				title: 'Stream was deleted',
-				message: 'Successfully Deleted!!',
-				icon: <IconCheck size="1rem" />,
-				autoClose: 1000,
-			});
-			resetDeleteStraeam();
+		if (deleteData) {
 			resetStreamArray();
 			getData();
 			return;
 		}
-		if (deleteError) {
-			notifications.update({
-				id: 'delete-data',
-				color: 'red',
-				title: 'Error Occured',
-				message: 'Error Occured while deleting stream',
-				icon: <IconFileAlert size="1rem" />,
-				autoClose: 2000,
-			});
-			return;
-		}
-		if(streams && streams.length!==0 && deleteStream===streamName){
-			navigate(`/${streams[0].name}/query`);
-		}
+	}, [deleteData]);
 
-	}, [deleteData, deleteError, deleteLoading,streams]);
 
+	const { classes } = useNavbarStyles();
+	const {
+		container,
+		linkBtnActive,
+		linkBtn,
+		selectStreambtn,
+		streamsBtn,
+		lowerContainer,
+		actionBtn,
+		helpTitle,
+		helpDescription,
+		userBtn,
+	} = classes;
 	return (
 		<MantineNavbar {...props} withBorder zIndex={1} hiddenBreakpoint={window.outerWidth + 20} hidden={isSubNavbarOpen}>
 			<MantineNavbar.Section grow className={container}>
-				<NavLink
-					label="Log Streams"
-					icon={<IconBinaryTree2 size="1.5rem" stroke={1.3} />}
-					className={streamsBtn}
-				/>
+				<NavLink label="Log Streams" icon={<IconBinaryTree2 size="1.5rem" stroke={1.3} />} className={streamsBtn} />
 				<Select
 					placeholder="Pick one"
 					onChange={(value) => handleChange(value || '')}
@@ -276,20 +208,18 @@ const Navbar: FC<NavbarProps> = (props) => {
 								setCurrentPage(link.pathname);
 							}}
 							key={link.label}
-							className={
-								link.pathname ? (window.location.pathname.includes(link.pathname) ? linkBtnActive : linkBtn) : linkBtn
-							}
+							className={(currentPage === link.pathname && linkBtnActive) || linkBtn}	
 						/>
 					);
-						})}
+				})}
 				<NavLink
-				label={"Delete"}
-				icon={<IconTrash size="1.3rem" stroke={1.2} />}
-				sx={{ paddingLeft: 53 }}
-				onClick={openDelete}
-				className={ linkBtn}
-				disabled={disableLink}
-			/>
+					label={'Delete'}
+					icon={<IconTrash size="1.3rem" stroke={1.2} />}
+					sx={{ paddingLeft: 53 }}
+					onClick={openDelete}
+					className={linkBtn}
+					disabled={disableLink}
+				/>
 				{error && <div>{error}</div>}
 				{error && (
 					<NavLink
@@ -318,29 +248,29 @@ const Navbar: FC<NavbarProps> = (props) => {
 					onClick={onSignOut}
 				/>
 			</MantineNavbar.Section>
-			<Modal withinPortal size="md" opened={openedDelete} onClose={handleCloseDelete} title={"Delete Stream"}centered>
+			<Modal withinPortal size="md" opened={openedDelete} onClose={handleCloseDelete} title={'Delete Stream'} centered>
 				<Text>Are you sure you want to delete this stream?</Text>
 				<TextInput
-				 type="text" 
-				onChange={(e) => {
-					console.log(e.target.value);
-					setDeleteStream(e.target.value);
-				}
-				}
-				 placeholder= {`Type the name of the stream to confirm. i.e: ${streamName}`} />
-				
-				<Box mt={10} display="flex" sx={{justifyContent:"end"}}>
-				<Button variant="filled" color='red' sx={{margin:"12px"}} disabled={deleteStream===streamName?false:true}
-					onClick={handleDelete}
-					>
+					type="text"
+					onChange={(e) => {
+						setDeleteStream(e.target.value);
+					}}
+					placeholder={`Type the name of the stream to confirm. i.e: ${streamName}`}
+				/>
+
+				<Box mt={10} display="flex" sx={{ justifyContent: 'end' }}>
+					<Button
+						variant="filled"
+						color="red"
+						sx={{ margin: '12px' }}
+						disabled={deleteStream === streamName ? false : true}
+						onClick={handleDelete}>
 						Delete
 					</Button>
-					<Button onClick={handleCloseDelete} variant='filled' color='green'sx={{margin:"12px"}}>
+					<Button onClick={handleCloseDelete} variant="filled" color="green" sx={{ margin: '12px' }}>
 						Cancel
 					</Button>
-
 				</Box>
-
 			</Modal>
 			<Modal withinPortal opened={opened} onClose={close} withCloseButton={false} size="sm" centered>
 				<Text className={helpTitle}>Need any help?</Text>
diff --git a/src/hooks/useDeleteLogStream.ts b/src/hooks/useDeleteLogStream.ts
deleted file mode 100644
index c708e1d1..00000000
--- a/src/hooks/useDeleteLogStream.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import { deleteLogStream } from '@/api/logStream';
-import { StatusCodes } from 'http-status-codes';
-import useMountedState from './useMountedState';
-
-export const useDeleteLogStream = () => {
-	const [data, setData] = useMountedState<any | null>(null);
-	const [error, setError] = useMountedState<string | null>(null);
-	const [loading, setLoading] = useMountedState<boolean>(false);
-
-	const deleteLogStreamFun = async (streamName: string) => {
-		try {
-			setLoading(true);
-			setError(null);
-			const res = await deleteLogStream(streamName);
-
-			switch (res.status) {
-				case StatusCodes.OK: {
-					const streams = res.data;
-
-					setData(streams);
-					break;
-				}
-				default: {
-					setError('Failed to get ALert');
-				}
-			}
-		} catch {
-			setError('Failed to get ALert');
-		} finally {
-			setLoading(false);
-		}
-	};
-
-	const resetData = () => {
-		setData(null);
-	};
-
-	return { data, error, loading, deleteLogStreamFun, resetData };
-};
diff --git a/src/hooks/useDeleteLogStream.tsx b/src/hooks/useDeleteLogStream.tsx
new file mode 100644
index 00000000..6afbdbc7
--- /dev/null
+++ b/src/hooks/useDeleteLogStream.tsx
@@ -0,0 +1,77 @@
+import { deleteLogStream } from '@/api/logStream';
+import { StatusCodes } from 'http-status-codes';
+import useMountedState from './useMountedState';
+import { notifications } from '@mantine/notifications';
+import {  IconCheck, IconFileAlert } from '@tabler/icons-react';
+
+
+export const useDeleteLogStream = () => {
+	const [data, setData] = useMountedState<any | null>(null);
+	const [error, setError] = useMountedState<string | null>(null);
+	const [loading, setLoading] = useMountedState<boolean>(false);
+
+	const deleteLogStreamFun = async (streamName: string) => {
+		try {
+			setLoading(true);
+			notifications.show({
+				id: 'delete-data',
+				loading: true,
+				color: '#545BEB',
+				title: 'Deleting Stream',
+				message: 'Stream will be deleted.',
+				autoClose: false,
+				withCloseButton: false,
+
+			});
+			setError(null);
+			const res = await deleteLogStream(streamName);
+
+			switch (res.status) {
+				case StatusCodes.OK: {
+					const streams = res.data;
+
+					setData(streams);
+					notifications.update({
+						id: 'delete-data',
+						color: 'green',
+						title: 'Stream was deleted',
+						message: 'Successfully Deleted!!',
+						icon: <IconCheck size="1rem" />,
+						autoClose: 8000,
+					});
+					break;
+
+				}
+				default: {
+					setError('Failed to get ALert');
+					notifications.update({
+						id: 'delete-data',
+						color: 'red',
+						title: 'Error Occured',
+						message: 'Error Occured while deleting stream',
+						icon: <IconFileAlert size="1rem" />,
+						autoClose: 2000,
+					});
+				}
+			}
+		} catch {
+			setError('Failed to get ALert');
+			notifications.update({
+				id: 'delete-data',
+				color: 'red',
+				title: 'Error Occured',
+				message: 'Error Occured while deleting stream',
+				icon: <IconFileAlert size="1rem" />,
+				autoClose: 2000,
+			});
+		} finally {
+			setLoading(false);
+		}
+	};
+
+	const resetData = () => {
+		setData(null);
+	};
+
+	return { data, error, loading, deleteLogStreamFun, resetData };
+};
diff --git a/src/hooks/useGetLogStreamList.ts b/src/hooks/useGetLogStreamList.ts
deleted file mode 100644
index 4e972ddf..00000000
--- a/src/hooks/useGetLogStreamList.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { LogStreamData } from '@/@types/parseable/api/stream';
-
-import { getLogStreamList } from '@/api/logStream';
-import { StatusCodes } from 'http-status-codes';
-import { useEffect } from 'react';
-import useMountedState from './useMountedState';
-
-export const useGetLogStreamList = () => {
-	const [data, setData] = useMountedState<LogStreamData | null>(null);
-	const [error, setError] = useMountedState<string | null>(null);
-	const [loading, setLoading] = useMountedState<boolean>(false);
-
-	const getData = async () => {
-		try {
-			setLoading(true);
-			setError(null);
-			const res = await getLogStreamList();
-
-			switch (res.status) {
-				case StatusCodes.OK: {
-					const streams = res.data;
-
-					setData(streams);
-					break;
-				}
-				default: {
-					setError('Failed to get log streams');
-				}
-			}
-		} catch {
-			setError('Failed to get log streams');
-		} finally {
-			setLoading(false);
-		}
-	};
-	const resetData = () => {
-		setData(null);
-	};
-
-	useEffect(() => {
-		getData();
-	}, []);
-
-	return { data, error, loading, getData ,resetData};
-};
diff --git a/src/hooks/useGetLogStreamList.tsx b/src/hooks/useGetLogStreamList.tsx
new file mode 100644
index 00000000..494d9e29
--- /dev/null
+++ b/src/hooks/useGetLogStreamList.tsx
@@ -0,0 +1,93 @@
+import { LogStreamData } from '@/@types/parseable/api/stream';
+
+import { getLogStreamList } from '@/api/logStream';
+import { StatusCodes } from 'http-status-codes';
+import { useEffect } from 'react';
+import useMountedState from './useMountedState';
+import { notifications } from '@mantine/notifications';
+import { IconFileAlert, IconCheck } from '@tabler/icons-react';
+
+export const useGetLogStreamList = () => {
+	const [data, setData] = useMountedState<LogStreamData | null>(null);
+	const [error, setError] = useMountedState<string | null>(null);
+	const [loading, setLoading] = useMountedState<boolean>(false);
+
+	const getData = async () => {
+		try {
+			setLoading(true);
+			setError(null);
+			notifications.show({
+				id: 'load-data',
+				loading: true,
+				color: '#545BEB',
+				title: 'Fetching Streams',
+				message: 'Streams will be loaded.',
+				autoClose: false,
+				withCloseButton: false,
+			});
+			const res = await getLogStreamList();
+
+			switch (res.status) {
+				case StatusCodes.OK: {
+					const streams = res.data;
+
+					setData(streams);
+					if (streams && Boolean(streams.length)) {
+						notifications.update({
+							id: 'load-data',
+							color: 'green',
+							title: 'Streams was loaded',
+							message: 'Successfully Loaded!!',
+						icon: <IconCheck size="1rem" />,
+							autoClose: 1000,
+						});
+					}
+
+					if(streams && streams.length===0){
+						notifications.update({
+							id: 'load-data',
+							color: 'red',
+							title: 'No Streams',
+							message: 'No Streams Found in your account',
+						icon: <IconFileAlert size="1rem" />,
+							autoClose: 2000,
+						});
+					}
+					break;
+				}
+				default: {
+					setError('Failed to get log streams');
+					notifications.update({
+						id: 'load-data',
+						color: 'red',
+						title: 'Error Occured',
+						message: 'Error Occured while fetching streams',
+						icon: <IconFileAlert size="1rem" />,
+						autoClose: 2000,
+					});
+				}
+			}
+		} catch {
+			setError('Failed to get log streams');
+			notifications.update({
+				id: 'load-data',
+				color: 'red',
+				title: 'Error Occured',
+				message: 'Error Occured while fetching streams',
+				icon: <IconFileAlert size="1rem" />,
+				autoClose: 2000,
+			});
+		} finally {
+			setLoading(false);
+		}
+	};
+	const resetData = () => {
+		setData(null);
+	};
+
+	useEffect(() => {
+		getData();
+	}, []);
+
+	return { data, error, loading, getData ,resetData};
+};
diff --git a/src/hooks/useQueryLogs.ts b/src/hooks/useQueryLogs.ts
index 5732647d..9d033d4a 100644
--- a/src/hooks/useQueryLogs.ts
+++ b/src/hooks/useQueryLogs.ts
@@ -143,7 +143,6 @@ export const useQueryLogs = () => {
 				_dataRef.current = [];
 				return;
 			}
-			console.log(logsQueryRes);
 			setError('Failed to query log');
 		} catch {
 			setError('Failed to query log');
diff --git a/src/pages/Logs/index.tsx b/src/pages/Logs/index.tsx
index 5953dfcc..cddcdee8 100644
--- a/src/pages/Logs/index.tsx
+++ b/src/pages/Logs/index.tsx
@@ -6,7 +6,7 @@ import { useLogsStyles } from './styles';
 import ViewLog from './ViewLog';
 
 const Logs: FC = () => {
-	useDocumentTitle('Parseable | Dashboard');
+	useDocumentTitle('Parseable | Logs');
 
 	const { classes } = useLogsStyles();
 	const { container } = classes;
diff --git a/src/pages/Query/QueryCodeEditor.tsx b/src/pages/Query/QueryCodeEditor.tsx
index 5972cbb6..8c382890 100644
--- a/src/pages/Query/QueryCodeEditor.tsx
+++ b/src/pages/Query/QueryCodeEditor.tsx
@@ -23,9 +23,9 @@ const QueryCodeEditor: FC = () => {
 	const editorRef = React.useRef<any>();
 	const monacoRef = React.useRef<any>();
 	const [isSchemaOpen, setIsSchemaOpen] = useMountedState(false);
-	const [query, setQuery] = React.useState<string>(`SELECT * FROM ${subLogQuery.get().streamName} LIMIT 100`);
 	const [refreshInterval, setRefreshInterval] = useMountedState<number | null>(null);
-	const [currentStreamName, setCurrentStreamName] = useMountedState<string>('');
+	const [currentStreamName, setCurrentStreamName] = useMountedState<string>("");
+	const [query, setQuery] = useMountedState<string>("");
 
 	const handleEditorChange = (code: any) => {
 		setQuery(code);
@@ -36,7 +36,7 @@ const QueryCodeEditor: FC = () => {
 	useEffect(() => {
 		if (subRefreshInterval.get()) {
 			const interval = setInterval(() => {
-				runQuery();
+				runQuery(query);
 			}, subRefreshInterval.get() as number);
 			return () => clearInterval(interval);
 		}
@@ -46,11 +46,12 @@ const QueryCodeEditor: FC = () => {
 		const listener = subSchemaToggle.subscribe(setIsSchemaOpen);
 		const refreshIntervalListener = subRefreshInterval.subscribe(setRefreshInterval);
 		const subQueryListener = subLogQuery.subscribe((state) => {
-			if (state.streamName!==currentStreamName) {
+			if (state.streamName) {
+				if (state.streamName !== currentStreamName) {
+					setQuery(`SELECT count(*) FROM ${state.streamName} ;`);
+					result.set('');
+				}
 				setCurrentStreamName(state.streamName);
-				setQuery(`SELECT * FROM ${state.streamName} LIMIT 100  ; `);
-				console.log(['state.streamName',state.streamName,currentStreamName]);
-				result.set('');
 			}
 		});
 		return () => {
@@ -58,20 +59,24 @@ const QueryCodeEditor: FC = () => {
 			refreshIntervalListener();
 			subQueryListener();
 		};
-	}, [currentStreamName]);
+	}, [subLogQuery.get(), subSchemaToggle.get(), subRefreshInterval.get()]);
+
+useEffect(() => {
+	if(subLogQuery.get().streamName){
+		setQuery(`SELECT * FROM ${subLogQuery.get().streamName} LIMIT 100  ; `);
+		setCurrentStreamName(subLogQuery.get().streamName);
+	}
+}, []);
 
 
 	function handleEditorDidMount(editor: any, monaco: any) {
 		editorRef.current = editor;
 		monacoRef.current = monaco;
-		editor.addCommand(
-			monaco.KeyMod.CtrlCmd + monaco.KeyCode.Enter,
-			async () => {
-				runQuery();
-			},
-		  );
+		editor.addCommand(monaco.KeyMod.CtrlCmd + monaco.KeyCode.Enter, async () => {
+			runQuery(editor.getValue());
+		});
 	}
-	const runQuery = () => {
+	const runQuery = (query:string) => {
 		resetData();
 		notifications.show({
 			id: 'load-data',
@@ -82,16 +87,22 @@ const QueryCodeEditor: FC = () => {
 			autoClose: false,
 			withCloseButton: false,
 		});
-		if (subLogSelectedTimeRange.get().includes('Past')) {
+		let LogQuery ={
+			startTime : subLogQuery.get().startTime,
+			endTime :subLogQuery.get().endTime,
+			streamName : currentStreamName
+		}
+		if (subLogSelectedTimeRange.get().includes('last')) {
 			const now = dayjs();
 			const timeDiff = subLogQuery.get().endTime.getTime() - subLogQuery.get().startTime.getTime();
-			subLogQuery.set((state) => {
-				state.startTime = now.subtract(timeDiff).toDate();
-				state.endTime = now.toDate();
-			});
+			LogQuery ={
+				startTime : now.subtract(timeDiff).toDate(),
+				endTime :now.toDate(),
+				streamName : currentStreamName
+			}
 		}
 		const parsedQuery = query.replace(/(\r\n|\n|\r)/gm, '');
-		getQueryData(subLogQuery.get(), parsedQuery);
+		getQueryData(LogQuery, parsedQuery);
 	};
 	useEffect(() => {
 		if (error) {
@@ -128,17 +139,27 @@ const QueryCodeEditor: FC = () => {
 			<Box className={container}>
 				<Text className={textContext}>Query</Text>
 				<Box style={{ height: '100%', width: '100%', textAlign: 'right' }}>
-				<Tooltip label={`View Schema for ${subLogQuery.get().streamName}`} sx={{color:"white",backgroundColor:"black"}}withArrow position="right">
-					<Button variant="default" className={actionBtn} 
-					aria-label='Schema'
-					onClick={() => subSchemaToggle.set(!isSchemaOpen)}>
-						<IconFileInfo size={px('1.2rem')} stroke={1.5} />
-					</Button>
-				</Tooltip>
-					<Tooltip label={"Click to Run Query or ctrl + enter "} sx={{color:"white",backgroundColor:"black"}}withArrow position="right">
-					<Button variant="default" className={runQueryBtn} onClick={runQuery}>
-						<IconPlayerPlayFilled size={px('1.2rem')} stroke={1.5} />
-					</Button>
+					<Tooltip
+						label={`View Schema for ${subLogQuery.get().streamName}`}
+						sx={{ color: 'white', backgroundColor: 'black' }}
+						withArrow
+						position="right">
+						<Button
+							variant="default"
+							className={actionBtn}
+							aria-label="Schema"
+							onClick={() => subSchemaToggle.set(!isSchemaOpen)}>
+							<IconFileInfo size={px('1.2rem')} stroke={1.5} />
+						</Button>
+					</Tooltip>
+					<Tooltip
+						label={'Click to Run Query or ctrl + enter '}
+						sx={{ color: 'white', backgroundColor: 'black' }}
+						withArrow
+						position="right">
+						<Button variant="default" className={runQueryBtn} onClick={()=>{runQuery(query)}}>
+							<IconPlayerPlayFilled size={px('1.2rem')} stroke={1.5} />
+						</Button>
 					</Tooltip>
 				</Box>
 			</Box>
diff --git a/src/pages/Stats/Alerts.tsx b/src/pages/Stats/Alerts.tsx
index 0d474dc8..ca46dda6 100644
--- a/src/pages/Stats/Alerts.tsx
+++ b/src/pages/Stats/Alerts.tsx
@@ -1,7 +1,7 @@
 import { useGetLogStreamAlert } from '@/hooks/useGetLogStreamAlert';
 import { useHeaderContext } from '@/layouts/MainLayout/Context';
 import { Box, Button, Modal, ScrollArea, Text, px } from '@mantine/core';
-import { useDisclosure, useDocumentTitle } from '@mantine/hooks';
+import { useDisclosure } from '@mantine/hooks';
 import { FC, useEffect, useRef } from 'react';
 import { useAlertsStyles } from './styles';
 import { IconArrowsMaximize } from '@tabler/icons-react';
@@ -10,7 +10,7 @@ import useMountedState from '@/hooks/useMountedState';
 import { heights } from '@/components/Mantine/sizing';
 
 const Alerts: FC = () => {
-	useDocumentTitle('Parseable | Login');
+
 	const {
 		state: { subLogQuery },
 	} = useHeaderContext();
@@ -22,21 +22,18 @@ const Alerts: FC = () => {
 
 	useEffect(() => {
 		const subQueryListener = subLogQuery.subscribe((state) => {
-			if (data) {
-				resetData();
-			}
-			getLogAlert(state.streamName);
+			if (state.streamName) {
+				if (data) {
+					resetData();
+				}
+				getLogAlert(state.streamName);
+			}		
 		});
 		return () => {
 			subQueryListener();
 		};
 	}, [data]);
-	useEffect(() => {
-		if (data) {
-			resetData();
-		}
-		getLogAlert(subLogQuery.get().streamName);
-	}, []);
+
 
 	useEffect(() => {
 		setEditorHeight(AlertsWrapper.current?.offsetTop ? AlertsWrapper.current?.offsetTop + 15 : 0);
diff --git a/src/pages/Stats/Status.tsx b/src/pages/Stats/Status.tsx
index 0219a9cf..3b12a744 100644
--- a/src/pages/Stats/Status.tsx
+++ b/src/pages/Stats/Status.tsx
@@ -1,12 +1,18 @@
 import { useGetLogStreamRetention } from '@/hooks/useGetLogStreamRetention';
 import { useGetLogStreamStat } from '@/hooks/useGetLogStreamStat';
 import { FIXED_DURATIONS, useHeaderContext } from '@/layouts/MainLayout/Context';
-import { useDocumentTitle } from '@mantine/hooks';
 import { FC, useEffect } from 'react';
 import { useStatCardStyles, useStatusStyles } from './styles';
 import { Box, Text, ThemeIcon, Tooltip, px } from '@mantine/core';
 import dayjs from 'dayjs';
-import { IconClockStop, IconDatabase, IconInfoCircle, IconTimelineEventText, IconTransferIn, IconWindowMinimize } from '@tabler/icons-react';
+import {
+	IconClockStop,
+	IconDatabase,
+	IconInfoCircle,
+	IconTimelineEventText,
+	IconTransferIn,
+	IconWindowMinimize,
+} from '@tabler/icons-react';
 import { useQueryResult } from '@/hooks/useQueryResult';
 import useMountedState from '@/hooks/useMountedState';
 function convert(val: number) {
@@ -30,16 +36,16 @@ function formatBytes(a: any, b = 1) {
 	if (!+a) return '0 Bytes';
 	const c = 0 > b ? 0 : b,
 		d = Math.floor(Math.log(a) / Math.log(1024));
-	return `${parseFloat((a / Math.pow(1024, d)).toFixed(c))} ${['Bytes', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB', 'YiB'][d]
-		}`;
+	return `${parseFloat((a / Math.pow(1024, d)).toFixed(c))} ${
+		['Bytes', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB', 'YiB'][d]
+	}`;
 }
 
 const Status: FC = () => {
-	useDocumentTitle('Parseable | Login');
 	const [statusFIXEDDURATIONS, setStatusFIXEDDURATIONS] = useMountedState(0);
-	const [status, setStatus] = useMountedState("Loading....");
+	const [status, setStatus] = useMountedState('Loading....');
 	const [statusSuccess, setStatusSuccess] = useMountedState(true);
-	FIXED_DURATIONS
+	FIXED_DURATIONS;
 	const {
 		state: { subLogQuery },
 	} = useHeaderContext();
@@ -60,9 +66,11 @@ const Status: FC = () => {
 		resetData: resetStat,
 	} = useGetLogStreamStat();
 	useEffect(() => {
-		getLogRetention(subLogQuery.get().streamName);
-		getLogStat(subLogQuery.get().streamName);
-		getStatus();
+		if (subLogQuery.get().streamName) {
+			getLogRetention(subLogQuery.get().streamName);
+			getLogStat(subLogQuery.get().streamName);
+			getStatus();
+		}
 		return () => {
 			resetDataRetention();
 			resetStat();
@@ -72,59 +80,54 @@ const Status: FC = () => {
 	useEffect(() => {
 		const logQueryListener = subLogQuery.subscribe((query) => {
 			if (query.streamName) {
-				if (dataRetention) {
-					resetDataRetention();
-					resetStat();
-					resetqueryResult();
-					setStatusFIXEDDURATIONS(0);
-
-				}
+				setStatusFIXEDDURATIONS(0);
+				resetDataRetention();
+				resetStat();
+				resetqueryResult();
+				getLogRetention(query.streamName);
+				getLogStat(query.streamName);
 				getStatus();
-				getLogRetention(subLogQuery.get().streamName);
-				getLogStat(subLogQuery.get().streamName);
 			}
 		});
 
 		return () => {
 			logQueryListener();
 		};
-	}, [dataRetention]);
+	}, []);
 
 	const getStatus = async () => {
+
 		const now = dayjs();
-		const LogQuery =
-		{
+		const LogQuery = {
 			streamName: subLogQuery.get().streamName,
 			startTime: now.subtract(FIXED_DURATIONS[statusFIXEDDURATIONS].milliseconds, 'milliseconds').toDate(),
-			endTime: now.toDate()
-		}
+			endTime: now.toDate(),
+		};
 		getQueryData(LogQuery, `SELECT count(*) FROM ${subLogQuery.get().streamName} ;`);
-	}
+	};
 
 	useEffect(() => {
-		if (queryResult?.data[0] && queryResult?.data[0]["COUNT(UInt8(1))"]) {
-			setStatus(`${queryResult?.data[0]["COUNT(UInt8(1))"]} events in ${FIXED_DURATIONS[statusFIXEDDURATIONS].name}`);
+		if (queryResult?.data[0] && queryResult?.data[0]['COUNT(UInt8(1))']) {
+			setStatus(`${queryResult?.data[0]['COUNT(UInt8(1))']} events in ${FIXED_DURATIONS[statusFIXEDDURATIONS].name}`);
 			setStatusSuccess(true);
 			return;
 		}
 		if (errorQueryResult) {
-			setStatus(`Not Recieved any events in ${FIXED_DURATIONS[statusFIXEDDURATIONS-1].name}`);
+			setStatus(`Not Recieved any events in ${FIXED_DURATIONS[statusFIXEDDURATIONS - 1].name}`);
 			setStatusSuccess(false);
 			return;
 		}
-		if(queryResult?.data[0] && queryResult?.data[0]["COUNT(UInt8(1))"]&&queryResult?.data[0]["COUNT(UInt8(1))"]===0){
-			setStatus("Loading...");
-			if(FIXED_DURATIONS.length-1>statusFIXEDDURATIONS){
-				setStatusFIXEDDURATIONS(statusFIXEDDURATIONS+1);
+		if (queryResult?.data[0] && queryResult?.data[0]['COUNT(UInt8(1))'] === 0) {
+			setStatus('Loading...');
+			if (FIXED_DURATIONS.length - 1 > statusFIXEDDURATIONS) {
+				setStatusFIXEDDURATIONS(statusFIXEDDURATIONS + 1);
 				getStatus();
 				return;
-			}
-			else{
+			} else {
 				setStatus(`No events received ${FIXED_DURATIONS[statusFIXEDDURATIONS].name}`);
 				setStatusSuccess(false);
 			}
-		}
-		else{
+		} else {
 			setStatus(`No events received`);
 			setStatusSuccess(false);
 			return;
@@ -146,19 +149,24 @@ const Status: FC = () => {
 		<Box className={container}>
 			<Box className={headContainer}>
 				<Text className={statusText}>
-					<span className={statusSuccess?statusTextResult:statusTextFailed}> {status}</span>
+					<span className={statusSuccess ? statusTextResult : statusTextFailed}> {status}</span>
 				</Text>
 
 				<Box className={genterateContiner}>
-					<Text className={genterateText}>Generated at <span className={genterateTextResult}>[{!loadingStat
-							? errorStat
-								? 'ERROR'
-								: dataStat
+					<Text className={genterateText}>
+						Generated at{' '}
+						<span className={genterateTextResult}>
+							[
+							{!loadingStat
+								? errorStat
+									? 'ERROR'
+									: dataStat
 									? dayjs(dataStat?.time).format('HH:mm DD-MM-YYYY')
 									: 'Not found'
-							: 'Loading'}]
-							</span>
-							</Text>
+								: 'Loading'}
+							]
+						</span>
+					</Text>
 				</Box>
 			</Box>
 			<Box className={StatsContainer}>
@@ -210,11 +218,12 @@ const Status: FC = () => {
 						value: !loadingStat
 							? !errorStat
 								? dataStat?.ingestion?.size
-									? `${(100-
-										(parseInt(dataStat.storage.size.split(' ')[0]) /
-											parseInt(dataStat.ingestion.size.split(' ')[0])) *
-										100 
-									).toPrecision(4)} %`
+									? `${(
+											100 -
+											(parseInt(dataStat.storage.size.split(' ')[0]) /
+												parseInt(dataStat.ingestion.size.split(' ')[0])) *
+												100
+									  ).toPrecision(4)} %`
 									: 'NotFound'
 								: 'ERROR'
 							: 'Loading...',