diff --git a/src/main/middlewares/passportAuthenticate.ts b/src/main/middlewares/passportAuthenticate.ts
index 40ebc105..80e1841f 100644
--- a/src/main/middlewares/passportAuthenticate.ts
+++ b/src/main/middlewares/passportAuthenticate.ts
@@ -29,20 +29,20 @@ export default {
             if (!user) {
                 return res.redirect(`${baseURL}/login`);
             }
-            req.login(user, (loginErr) => {
+            return req.login(user, (loginErr) => {
                 if (loginErr) {
                     return next(loginErr);
                 }
-                generateToken(user)
+                return generateToken(user)
                     .then((token: any) => {
                         req.session.token = token;
+                        req.session.roles = _.get(user, ['roles']);
+                        req.session.userDetails = _.pick(user, ['id', 'user_name', 'email_address', 'roles']);
+                        return res.redirect(baseURL || '/');
                     })
                     .catch((tokenError) => {
                         return next(tokenError);
                     });
-                req.session.roles = _.get(user, ['roles']);
-                req.session.userDetails = _.pick(user, ['id', 'user_name', 'email_address', 'roles']);
-                res.redirect(baseURL || '/');
             });
         })(req, res, next);
     },
diff --git a/web-console-v2/src/components/Dropzone/PlaceholderContent.tsx b/web-console-v2/src/components/Dropzone/PlaceholderContent.tsx
index 9013689f..8a6e55a8 100644
--- a/web-console-v2/src/components/Dropzone/PlaceholderContent.tsx
+++ b/web-console-v2/src/components/Dropzone/PlaceholderContent.tsx
@@ -15,7 +15,6 @@ const PlaceholderContent = ({ imageUrl, mainText, subText, type }: PlaceholderCo
             {type !== DropzopType.standard && (
                 <Card
                     sx={{
-                        width: '22rem',
                         height: '11rem',
                         margin: 4,
                         boxShadow: '0.625rem 0.625rem 2.75rem 0 rgba(0, 0, 0, 0.1)'
@@ -24,7 +23,7 @@ const PlaceholderContent = ({ imageUrl, mainText, subText, type }: PlaceholderCo
                     <CardMedia
                         component="img"
                         image={imageUrl}
-                        sx={{ width: '64px', height: '4rem', marginLeft: 15, marginTop: 3 }}
+                        sx={{ width: '64px', height: '4rem', margin: "auto", marginTop: 3 }}
                     />
                     <CardContent>
                         <Stack
diff --git a/web-console-v2/src/components/Sidebar/Sidebar.tsx b/web-console-v2/src/components/Sidebar/Sidebar.tsx
index 579b1b28..264ca441 100644
--- a/web-console-v2/src/components/Sidebar/Sidebar.tsx
+++ b/web-console-v2/src/components/Sidebar/Sidebar.tsx
@@ -104,9 +104,10 @@ const Sidebar: React.FC<Props> = ({ onExpandToggle, expand }) => {
     };
 
     const handleLogout = () => {
-            http.get(apiEndpoints.logout).then(() => {
-                navigate(`/login`);
-            }).catch(() => {
+        http.get(apiEndpoints.logout).then(() => {
+            localStorage.clear();
+            navigate(`/login`);
+        }).catch(() => {
             showAlert('Failed to logout', 'error');
         })
     };
diff --git a/web-console-v2/src/components/form.tsx b/web-console-v2/src/components/form.tsx
index 70962f19..441253ab 100644
--- a/web-console-v2/src/components/form.tsx
+++ b/web-console-v2/src/components/form.tsx
@@ -218,7 +218,6 @@ const MUIForm = forwardRef((props: any, ref: any) => {
                                         <FormControl fullWidth key={name} className={classes.formControl} required={required} disabled={disabled}>
                                             <Autocomplete
                                                 id={name}
-                                                componentsProps={{ popper: { style: { width: 'fit-content' } } }}
                                                 value={val || null}
                                                 disableClearable
                                                 options={selectOptions}
diff --git a/web-console-v2/src/pages/IngestionPage/IngestionPage.tsx b/web-console-v2/src/pages/IngestionPage/IngestionPage.tsx
deleted file mode 100644
index 1f6dc8e3..00000000
--- a/web-console-v2/src/pages/IngestionPage/IngestionPage.tsx
+++ /dev/null
@@ -1,52 +0,0 @@
-import React from 'react';
-import DynamicStepper from '../../components/Stepper/DynamicStepper';
-import { Outlet } from 'react-router-dom';
-import { Box } from '@mui/material';
-
-const stepData = {
-  steps: [
-      {
-          name: 'Ingestion',
-          index: 1,
-          completed: false,
-          onProgress: true,
-          route: 'ingestion'
-      },
-      {
-          name: 'Processing',
-          index: 2,
-          completed: false,
-          onProgress: false,
-          route: 'processing'
-      },
-      {
-          name: 'Storage',
-          index: 3,
-          completed: false,
-          onProgress: false,
-          route: 'storage'
-      },
-      {
-          name: 'Preview & Save',
-          index: 4,
-          completed: false,
-          onProgress: false,
-          route: 'preview'
-      }
-  ],
-  initialSelectedStep: 1
-};
-
-const UploadPage: React.FC = () => {
-  return (
-    <Box>
-      <DynamicStepper
-        steps={stepData.steps}
-        initialSelectedStep={stepData.initialSelectedStep}
-      />
-      <Outlet />
-    </Box>
-  );
-};
-
-export default UploadPage;
diff --git a/web-console-v2/src/pages/alertManager/components/NotificationComponent.tsx b/web-console-v2/src/pages/alertManager/components/NotificationComponent.tsx
index 79e9debf..97a0001e 100644
--- a/web-console-v2/src/pages/alertManager/components/NotificationComponent.tsx
+++ b/web-console-v2/src/pages/alertManager/components/NotificationComponent.tsx
@@ -47,7 +47,7 @@ const NotificationComponent = (props: any) => {
             label: "Notification Channels",
             type: "autocomplete",
             required: true,
-            selectOptions: _.concat([{ label: 'none', value: null }], notificationFieldOptions),
+            selectOptions: notificationFieldOptions,
             tooltip: "Select the channel for notification delivery"
         },
     ];
@@ -89,7 +89,7 @@ const NotificationComponent = (props: any) => {
                 />
             </Grid>
             <Grid item xs={6}>
-                <Button variant="contained" onClick={() => navigate("/home/alertChannels")}>Add Notification Channel</Button>
+                <Button variant="contained" onClick={() => navigate("/home/alertChannels")}>Create Notification Channel</Button>
             </Grid>
         </Grid>
     }
@@ -103,12 +103,12 @@ const NotificationComponent = (props: any) => {
                 <Box>
                     <StandardWidthButton
                         data-edataid={interactIds.add_notification_channel}
-                        onClick={() => navigate('/home/alertChannels')}
+                        onClick={() => navigate('/home/alertChannels/new')}
                         variant="contained"
                         size="large"
                         sx={{ width: 'auto' }}
                     >
-                        <Typography variant="h5">
+                        <Typography variant="button">
                             Create Notification Channel
                         </Typography>
                     </StandardWidthButton>
diff --git a/web-console-v2/src/pages/alertManager/components/QueryBuilder.tsx b/web-console-v2/src/pages/alertManager/components/QueryBuilder.tsx
index 31fa2cb7..40c34570 100644
--- a/web-console-v2/src/pages/alertManager/components/QueryBuilder.tsx
+++ b/web-console-v2/src/pages/alertManager/components/QueryBuilder.tsx
@@ -18,10 +18,12 @@ const QueryBuilder = (props: any) => {
         if (!_.isEmpty(existingState)) {
             const operatorType = _.get(existingState, "operator")
             const thresholdValue = _.get(existingState, "threshold")
+            const metricId = _.get(existingState, "id") || ""
+
             if (_.includes(["within_range", "outside_range"], operatorType)) {
-                return { ..._.omit(existingState, ["threshold"]), threshold_from: _.get(thresholdValue, 0), threshold_to: _.get(thresholdValue, 1) }
+                return { ..._.omit(existingState, ["threshold"]), threshold_from: _.get(thresholdValue, 0), threshold_to: _.get(thresholdValue, 1), metric: metricId }
             }
-            return { ..._.omit(existingState, ["threshold_from", "threshold_to"]), threshold: _.get(thresholdValue, 0) }
+            return { ..._.omit(existingState, ["threshold_from", "threshold_to"]), threshold: _.get(thresholdValue, 0), metric: metricId }
         }
         return {}
     });
@@ -68,18 +70,18 @@ const QueryBuilder = (props: any) => {
         if (selectedSubComponent) {
             const filteredMetrics = _.filter(supportedMetrics, (supportedMetric) => supportedMetric.subComponent == selectedSubComponent);
             return _.map(filteredMetrics, (supportedMetric) => {
-                const { alias, metric } = supportedMetric;
+                const { alias, id } = supportedMetric;
                 return {
                     label: alias,
-                    value: metric
+                    value: id
                 };
             });
         }
         return _.map(supportedMetrics, (supportedMetric) => {
-            const { alias, metric } = supportedMetric;
+            const { alias, id } = supportedMetric;
             return {
                 label: alias,
-                value: metric
+                value: id
             };
         });
     };
@@ -264,7 +266,7 @@ const QueryBuilder = (props: any) => {
                 </Grid>
                 {runQuery && (
                     <Grid item xs={12}>
-                        <RunQuery random={Math.random()} handleClose={updateRunQuery} queryBuilderContext={value} />
+                        <RunQuery random={Math.random()} handleClose={updateRunQuery} queryBuilderContext={value} component={_.get(components, _.get(value, 'category'))} />
                     </Grid>
                 )}
             </>
@@ -301,4 +303,4 @@ const QueryBuilder = (props: any) => {
     </>
 }
 
-export default QueryBuilder;
\ No newline at end of file
+export default React.memo(QueryBuilder);
\ No newline at end of file
diff --git a/web-console-v2/src/pages/alertManager/components/RuleLabels.tsx b/web-console-v2/src/pages/alertManager/components/RuleLabels.tsx
index 48b982bc..d8838f0d 100644
--- a/web-console-v2/src/pages/alertManager/components/RuleLabels.tsx
+++ b/web-console-v2/src/pages/alertManager/components/RuleLabels.tsx
@@ -165,7 +165,7 @@ const LabelComponent = (props: any) => {
                 <Grid item xs={12}>
                     <Button
                         variant="contained"
-                        color="success"
+                        color="primary"
                         disabled={formErrors}
                         onClick={() => {
                             const index = _.findIndex(labels, (label) => label.label === value.label);
diff --git a/web-console-v2/src/pages/alertManager/components/RunQuery.tsx b/web-console-v2/src/pages/alertManager/components/RunQuery.tsx
index f0009cf4..a89438dd 100644
--- a/web-console-v2/src/pages/alertManager/components/RunQuery.tsx
+++ b/web-console-v2/src/pages/alertManager/components/RunQuery.tsx
@@ -10,8 +10,9 @@ import { useEffect, useState } from "react";
 import Loader from "components/Loader";
 
 const RunQuery = (props: any) => {
-    const { handleClose, queryBuilderContext } = props;
+    const { handleClose, queryBuilderContext, component } = props;
     const { metric, threshold, threshold_from, threshold_to, operator } = queryBuilderContext
+    const metricValue = _.filter(component, field => _.get(field, "id") == metric)
     const [metadata, setMetadata] = useState<Record<string, any> | null>(null);
     const [loading, setLoading] = useState(false)
 
@@ -139,7 +140,7 @@ const RunQuery = (props: any) => {
                 headers: {},
                 body: {},
                 params: {
-                    query: metric,
+                    query: _.get(metricValue, [0, "metric"]) || metric,
                     step: '5m',
                     start: dayjs().unix(),
                     end: dayjs().subtract(1, 'day').unix()
diff --git a/web-console-v2/src/pages/alertManager/services/utils.tsx b/web-console-v2/src/pages/alertManager/services/utils.tsx
index b04bc8b2..c2cb0bd9 100644
--- a/web-console-v2/src/pages/alertManager/services/utils.tsx
+++ b/web-console-v2/src/pages/alertManager/services/utils.tsx
@@ -8,6 +8,7 @@ import { LocalizationProvider, DateTimePicker } from '@mui/x-date-pickers';
 import { AdapterDayjs } from '@mui/x-date-pickers/AdapterDayjs';
 import { searchAlert } from 'services/alerts';
 import { fetchChannels } from 'services/notificationChannels';
+import { getMetricsGroupedByComponents } from './queryBuilder';
 
 export const validateForm = (config: Record<string, any>) => {
     if (!config) return false;
@@ -196,10 +197,10 @@ const DatePicker = (props: any) => {
         <DateTimePicker
             label={label}
             value={date}
-            onChange={(newValue:any) => {
+            onChange={(newValue: any) => {
                 setDate(newValue, alertId);
             }}
-            renderInput={(params:any) => <TextField {...params} />}
+            renderInput={(params: any) => <TextField {...params} />}
         />
     );
 };
@@ -240,7 +241,7 @@ export const asyncValidation = () => {
 export const getStatusComponent = (props: any) => {
     return () => {
         const { statusData, setSilenceStatus, fetchDataHandler, toggleFilter, removeFilter } = props;
-        return _.map(statusData, (value:any, status:any) => (
+        return _.map(statusData, (value: any, status: any) => (
             <Chip
                 key={status}
                 size="small"
@@ -326,7 +327,7 @@ export const getStatusColor = (value: string) => {
     return _.get(valueToColorMapping, value?.toLowerCase()) || 'success';
 };
 
-export const transformRulePayload = (formData: Record<string, any>) => {
+export const transformRulePayload = async (formData: Record<string, any>) => {
     const {
         name,
         description,
@@ -340,7 +341,10 @@ export const transformRulePayload = (formData: Record<string, any>) => {
         context,
         severity
     } = formData;
-    const { threshold, threshold_from, threshold_to, operator } = queryBuilderContext
+    const { threshold, threshold_from, threshold_to, operator, metric } = queryBuilderContext
+    const components = await getMetricsGroupedByComponents();
+    const selectedComponent = _.get(components, category)
+    const metricValue = _.filter(selectedComponent, field => _.get(field, "id") == metric)
     const updatedThreshold = !_.includes(["within_range", "outside_range"], operator) ? [threshold] : [threshold_from, threshold_to]
     const rulePayload = {
         name,
@@ -356,7 +360,7 @@ export const transformRulePayload = (formData: Record<string, any>) => {
             type: category
         },
         metadata: {
-            queryBuilderContext: { ...queryBuilderContext, threshold: updatedThreshold }
+            queryBuilderContext: { ...queryBuilderContext, threshold: updatedThreshold, metric: _.get(metricValue, [0, "metric"]), id: metric }
         },
         context: {
             ...context
diff --git a/web-console-v2/src/pages/alertManager/views/AddRule.tsx b/web-console-v2/src/pages/alertManager/views/AddRule.tsx
index d1fde029..eb877d48 100644
--- a/web-console-v2/src/pages/alertManager/views/AddRule.tsx
+++ b/web-console-v2/src/pages/alertManager/views/AddRule.tsx
@@ -26,6 +26,12 @@ const AddAlertrules = () => {
     const sections = useMemo(() => {
         const commonProps = { formData, setFormData, showAlert, isFieldEditable };
         return [
+            {
+                id: 'notifications',
+                title: 'Notification Channel',
+                description: 'Configure notification channel for your alert',
+                component: <NotificationComponent {...{ ...commonProps, existingState: {}, sectionLabel: 'notifications' }} />
+            },
             {
                 id: 'queryBuilder',
                 title: 'Query Builder',
@@ -52,18 +58,12 @@ const AddAlertrules = () => {
                 title: 'Labels',
                 description: 'Attach labels to your alert',
                 component: <RuleLabels {...{ ...commonProps, existingState: {}, sectionLabel: 'labels', isFieldEditable }} />
-            },
-            {
-                id: 'notifications',
-                title: 'Notification Channel',
-                description: 'Configure notification channel for your alert',
-                component: <NotificationComponent {...{ ...commonProps, existingState: {}, sectionLabel: 'notifications' }} />
             }
         ];
     }, []);
 
     const addAlertRule: any = async () => {
-        const rulePayload = transformRulePayload({ ...formData, context: { alertType: 'CUSTOM' } });
+        const rulePayload = await transformRulePayload({ ...formData, context: { alertType: 'CUSTOM' } });
         return addAlert(rulePayload);
     };
 
diff --git a/web-console-v2/src/pages/alertManager/views/EditRule.tsx b/web-console-v2/src/pages/alertManager/views/EditRule.tsx
index 68b4bcb7..e74d52b1 100644
--- a/web-console-v2/src/pages/alertManager/views/EditRule.tsx
+++ b/web-console-v2/src/pages/alertManager/views/EditRule.tsx
@@ -53,6 +53,12 @@ const EditRule = () => {
     }
 
     const sections = useMemo(() => [
+        {
+            id: 'notifications',
+            title: 'Notification Channel',
+            description: 'Configure notification channel for your alert',
+            component: <NotificationComponent {...{ ...commonProps, existingState: _.pick(ruleMetadata, 'notification'), sectionLabel: "notifications", isFieldEditable }} />
+        },
         {
             id: 'queryBuilder',
             title: 'Query Builder',
@@ -70,17 +76,11 @@ const EditRule = () => {
             title: 'Labels',
             description: 'Attach labels to your alert',
             component: <RuleLabels {...{ ...commonProps, existingState: _.pick(ruleMetadata, 'labels'), sectionLabel: "labels", isFieldEditable }} />
-        },
-        {
-            id: 'notifications',
-            title: 'Notification Channel',
-            description: 'Configure notification channel for your alert',
-            component: <NotificationComponent {...{ ...commonProps, existingState: _.pick(ruleMetadata, 'notification'), sectionLabel: "notifications", isFieldEditable }} />
         }
     ], [ruleMetadata]);
 
-    const editAlertRule = () => {
-        const rulePayload = transformRulePayload({ ...formData, context: { alertType: alertType } });
+    const editAlertRule = async () => {
+        const rulePayload = await transformRulePayload({ ...formData, context: { alertType: alertType } });
         return editAlert({ id: id, data: rulePayload });
     };
 
diff --git a/web-console-v2/src/pages/dashboardV1/datasetsList.tsx b/web-console-v2/src/pages/dashboardV1/datasetsList.tsx
index dbdaa6e2..dbe07072 100644
--- a/web-console-v2/src/pages/dashboardV1/datasetsList.tsx
+++ b/web-console-v2/src/pages/dashboardV1/datasetsList.tsx
@@ -86,41 +86,66 @@ const DatasetsList = ({ setDatasetType, sourceConfigs }: any) => {
         getDatasets();
     }, [])
 
-    const AsyncColumnData = (query: Record<string, any>) => {
-        const [asyncData, setAsyncData] = useState(null);
+    const AsyncColumnData = (query: Record<string, any>, datasetId: any, cellKey: string) => {
         const [isLoading, setIsLoading] = useState(false);
 
-        const memoizedAsyncData = useMemo(() => asyncData, [asyncData]);
-
         useEffect(() => {
             const fetchData = async (value: any) => {
                 setIsLoading(true);
                 try {
                     let data = await fetchChartData(value);
-                    const responseData = Array.isArray(data) ? _.first(data) : data;
-                    setAsyncData(responseData as any);
-                }
-                catch (error) { }
-                finally {
-                    setIsLoading(false)
+                    const responseData = _.isArray(data) ? _.first(data) : data;
+
+                    // Always store the successful response in localStorage under datasetId and cellKey
+                    const storedData: any = localStorage.getItem(datasetId);
+                    const parsedData = !_.isEmpty(storedData) ? JSON.parse(storedData) : {};
+                    parsedData[cellKey] = responseData;
+                    localStorage.setItem(datasetId, JSON.stringify(parsedData));
+                } catch (error) {
+                    // Check if localStorage already has a value for cellKey, and only store the error if no value exists
+                    const storedData: any = localStorage.getItem(datasetId);
+                    const parsedData = !_.isEmpty(storedData) ? JSON.parse(storedData) : {};
+                    if (!parsedData[cellKey]) {
+                        // If localStorage doesn't contain a value for this cellKey, store 0 as value
+                        parsedData[cellKey] = 0;
+                        localStorage.setItem(datasetId, JSON.stringify(parsedData));
+                    }
+                } finally {
+                    setIsLoading(false);
                 }
             };
-            if (!memoizedAsyncData) {
-                fetchData(query);
-            }
-
+            fetchData(query);
         }, []);
 
         if (isLoading) {
             return <CircularProgress size={20} color="success" />;
         }
 
-        if ([null, undefined].includes(asyncData)) return "N/A";
-        const hoverValue = _.get(asyncData, "hoverValue") || ""
-        const value: any = _.get(asyncData, "value") || asyncData;
+        // Always read from localStorage on render, specific to the current cellKey
+        const storedData = localStorage.getItem(datasetId);
+        let parsedData = null;
+        try {
+            parsedData = storedData ? JSON.parse(storedData) : null;
+        } catch (error) {
+            console.error("Failed to parse stored data:", error);
+            parsedData = null;
+        }
+        const cellData = parsedData ? parsedData[cellKey] : null;
 
-        return <div><Tooltip title={hoverValue}>{value}</Tooltip></div>;
-    }
+        // Check if the stored data is an error
+        if (cellData?.error) return cellData.error;
+
+        if ([null, undefined].includes(cellData)) return "N/A";
+
+        const hoverValue = _.get(cellData, "hoverValue") || "";
+        const value: any = _.get(cellData, "value") || cellData;
+
+        return (
+            <div>
+                <Tooltip title={hoverValue}>{value}</Tooltip>
+            </div>
+        );
+    };
 
     const updateDatasetProps = ({ dataset_id, status, id, name, tags }: any) => {
         setData((prevState: any) => {
@@ -309,7 +334,7 @@ const DatasetsList = ({ setDatasetType, sourceConfigs }: any) => {
                     const body = druidQueries.total_events_processed({ datasetId, intervals: `${startDate}/${endDate}`, master: isMasterDataset, })
                     const query = _.get(chartMeta, 'total_events_processed.query');
                     if (row?.onlyTag) return null;
-                    return AsyncColumnData({ ...query, body });
+                    return AsyncColumnData({ ...query, body }, datasetId, "total_events");
                 }
             },
             {
@@ -324,7 +349,7 @@ const DatasetsList = ({ setDatasetType, sourceConfigs }: any) => {
                     const body = druidQueries.total_events_processed({ datasetId, intervals: `${startDate}/${endDate}`, master: isMasterDataset, })
                     const query = _.get(chartMeta, 'total_events_processed.query');
                     if (row?.onlyTag) return null;
-                    return AsyncColumnData({ ...query, body });
+                    return AsyncColumnData({ ...query, body }, datasetId, "total_events_yesterday");
                 }
             },
             {
@@ -339,7 +364,7 @@ const DatasetsList = ({ setDatasetType, sourceConfigs }: any) => {
                     const body = druidQueries.druid_avg_processing_time({ datasetId, intervals: `${startDate}/${endDate}`, master: isMasterDataset, })
                     const query = _.get(chartMeta, 'druid_avg_processing_time.query');
                     if (row?.onlyTag) return null;
-                    return AsyncColumnData({ ...query, body });
+                    return AsyncColumnData({ ...query, body }, datasetId, "average_processing_time");
                 }
             },
             {
@@ -354,7 +379,7 @@ const DatasetsList = ({ setDatasetType, sourceConfigs }: any) => {
                     const body = druidQueries.druid_avg_processing_time({ datasetId, intervals: `${startDate}/${endDate}`, master: isMasterDataset, })
                     const query = _.get(chartMeta, 'druid_avg_processing_time.query');
                     if (row?.onlyTag) return null;
-                    return AsyncColumnData({ ...query, body });
+                    return AsyncColumnData({ ...query, body }, datasetId, "average_processing_time_yesterday");
                 }
             },
             {
@@ -369,7 +394,7 @@ const DatasetsList = ({ setDatasetType, sourceConfigs }: any) => {
                     const body = druidQueries.last_synced_time({ datasetId, intervals: `${startDate}/${endDate}`, master: isMasterDataset, })
                     const query = _.get(chartMeta, 'last_synced_relative_time.query');
                     if (row?.onlyTag) return null;
-                    return AsyncColumnData({ ...query, body });
+                    return AsyncColumnData({ ...query, body }, datasetId, "last_synced_time");
                 }
             },
             {
@@ -384,7 +409,7 @@ const DatasetsList = ({ setDatasetType, sourceConfigs }: any) => {
                         _.get(chartMeta, 'failed_events_summary_master_datasets.query') :
                         _.get(chartMeta, 'failed_events_summary.query');
                     if (row?.onlyTag) return null;
-                    return AsyncColumnData({ ...query, time: endDate, dataset: datasetId, master: isMasterDataset, });
+                    return AsyncColumnData({ ...query, time: endDate, dataset: datasetId, master: isMasterDataset, }, datasetId, "events_failed");
                 }
             },
             {
diff --git a/web-console-v2/src/pages/datasetV1/ImportDataset.tsx b/web-console-v2/src/pages/datasetV1/ImportDataset.tsx
index fe7d16e9..979924cd 100644
--- a/web-console-v2/src/pages/datasetV1/ImportDataset.tsx
+++ b/web-console-v2/src/pages/datasetV1/ImportDataset.tsx
@@ -117,12 +117,12 @@ const ImportDataset = ({ open, onClose, setOpen }: any) => {
                     setIsLiveExists(true)
                     return
                 }
-                await importDataset(contents[0], config, overwrite);
+                const response = await importDataset(contents[0], config, overwrite);
                 setDatasetName("")
                 setDatasetId("")
-                showAlert(`Dataset imported successfully`, "success");
+                showAlert(_.get(response,"data.result.message","Dataset imported successfully"), "success");
                 navigate(`/home/datasets?status=${DatasetStatus.Draft}`)
-                window.location.reload()
+                // window.location.reload()
             } catch (err) {
                 setOpen(false)
                 setAcceptedFiles([])
diff --git a/web-console-v2/src/pages/datasetV1/ImportDialog.tsx b/web-console-v2/src/pages/datasetV1/ImportDialog.tsx
index 90100256..ac172dca 100644
--- a/web-console-v2/src/pages/datasetV1/ImportDialog.tsx
+++ b/web-console-v2/src/pages/datasetV1/ImportDialog.tsx
@@ -4,6 +4,8 @@ import MUIForm from "components/form";
 import HtmlTooltip from "components/HtmlTooltip";
 import _ from "lodash";
 import { useEffect, useState } from "react";
+import { datasetRead } from "services/datasetV1";
+import { DatasetStatus } from "types/datasets";
 
 const onSubmission = (value: any) => { };
 
@@ -13,6 +15,9 @@ const ImportDailog = (props: any) => {
     const [nameError, setNameError] = useState('');
     const [validImport, setValid] = useState(true)
     const [name, setName] = useState<any>("")
+    const [datasetExists, setDatasetExists] = useState<boolean>(true);
+    const [localDatasetId, setLocalDatasetId] = useState(datasetId);
+    const [localDatasetName, setLocalDatasetName] = useState(datasetName);
 
     const options = [
         { label: 'Import as new dataset', component: '', value: 'new' },
@@ -32,13 +37,13 @@ const ImportDailog = (props: any) => {
 
     const selectImportOption = async () => {
         const { importType } = value
-        await onSubmit({ datasetName, datasetId, importType })
+        await onSubmit({ datasetName: localDatasetName, datasetId: localDatasetId, importType })
         setOpenDailog(false)
     }
 
     const onClose = () => {
-        setDatasetName("")
-        setDatasetId("")
+        setLocalDatasetName("")
+        setLocalDatasetId("")
         setCheckValidation(true)
         setOpenDailog(false);
     }
@@ -46,8 +51,6 @@ const ImportDailog = (props: any) => {
     useEffect(() => {
         const { importType } = value
         if (importType === "new") {
-            setDatasetName("")
-            setDatasetId("")
             setCheckValidation(true)
         }
     }, [value])
@@ -55,22 +58,39 @@ const ImportDailog = (props: any) => {
     const nameRegex = /^[^!@#$%^&*()+{}[\]:;<>,?~\\|]*$/;
     const handleNameChange = (e: React.ChangeEvent<HTMLInputElement>) => {
         const newValue = e.target.value;
-        setDatasetName(newValue);
+        setLocalDatasetName(newValue);
         setName(newValue)
         if (nameRegex.test(newValue)) {
             const generatedId = newValue.toLowerCase().replace(/\s+/g, '-');
-            setDatasetId(generatedId)
+            setLocalDatasetId(generatedId)
             setNameError('');
         } else {
             setNameError('The field should exclude any special characters, permitting only alphabets, numbers, ".", "-", and "_".');
         }
     };
 
+    const fetchDataset = async () => {
+        return datasetRead({ datasetId: `${localDatasetId}?mode=edit` }).then((response: any) => {
+            return response?.data?.result
+        }).catch((err: any) => { console.log(err) })
+    }
+
+    const checkDatasetExists = async () => {
+        const isDatasetExists = await fetchDataset();
+        if (isDatasetExists) {
+            setDatasetExists(true);
+        }
+        else {
+            setDatasetExists(false);
+        }
+    };
+
     useEffect(() => {
+        checkDatasetExists()
         const { importType } = value
-        const isValid = !_.isEmpty(nameError) || (name.length < 4 || name.length > 100)
+        const isValid = datasetExists || !_.isEmpty(nameError) || (localDatasetName.length < 4 || localDatasetName.length > 100)
         importType === "overwrite" ? setValid(false) : setValid(isValid)
-    }, [datasetName, value, nameError])
+    }, [localDatasetName, value?.importType, nameError,datasetExists])
 
     return <Dialog fullWidth={true} open={openAlertDialog} onClose={closeDialog}>
         <Box sx={{ p: 1, py: 1.5 }}>
@@ -101,11 +121,17 @@ const ImportDailog = (props: any) => {
                                         label={'Dataset Name'}
                                         onChange={handleNameChange}
                                         required
-                                        value={datasetName}
+                                        value={localDatasetName}
                                         variant="outlined"
                                         fullWidth
-                                        error={Boolean(nameError)}
-                                        helperText={nameError || (datasetName.length > 0 && (datasetName.length < 4 || datasetName.length > 100) ? 'Dataset name should be between 4 and 100 characters' : '')}
+                                        error={Boolean(nameError) || datasetExists}
+                                        helperText={
+                                            nameError ||
+                                            (localDatasetName.length > 0 && (localDatasetName.length < 4 || localDatasetName.length > 100)
+                                                ? 'Dataset name should be between 4 and 100 characters'
+                                                : '') ||
+                                            (datasetExists ? 'Dataset already exists' : '')
+                                        }
                                     />
                                 </HtmlTooltip>
                             </Grid>
@@ -114,9 +140,9 @@ const ImportDailog = (props: any) => {
                                     <TextField
                                         name={'dataset_id'}
                                         label={'Dataset ID'}
-                                        onChange={(e) => setDatasetId(e.target.value)}
+                                        onChange={(e) => setLocalDatasetId(e.target.value)}
                                         required
-                                        value={datasetId}
+                                        value={localDatasetId}
                                         variant="outlined"
                                         fullWidth
                                         disabled