diff --git a/web/src/api/busterv2/dataset_groups/requests.ts b/web/src/api/busterv2/dataset_groups/requests.ts
index 4b6dd3197..52c70bea5 100644
--- a/web/src/api/busterv2/dataset_groups/requests.ts
+++ b/web/src/api/busterv2/dataset_groups/requests.ts
@@ -1,8 +1,8 @@
 import { mainApi } from '../../buster';
-import { ListDatasetGroupsResponse } from '../datasets';
+import { DatasetGroup } from './responseInterfaces';
 
 export const listDatasetGroups = async () => {
-  return mainApi.get<ListDatasetGroupsResponse[]>(`/dataset_groups`).then((res) => res.data);
+  return mainApi.get<DatasetGroup[]>(`/dataset_groups`).then((res) => res.data);
 };
 
 export const createDatasetGroup = async (data: { name: string }) => {
diff --git a/web/src/api/busterv2/datasets/queryRequests.ts b/web/src/api/busterv2/datasets/queryRequests.ts
index 9f6522ffb..7192764c2 100644
--- a/web/src/api/busterv2/datasets/queryRequests.ts
+++ b/web/src/api/busterv2/datasets/queryRequests.ts
@@ -113,7 +113,6 @@ export const useDeployDataset = () => {
     mutationFn,
     onSuccess: (data, variables, context) => {
       queryClient.invalidateQueries({ queryKey: ['datasets', {}] });
-      console.log(variables, context);
     }
   });
 };
diff --git a/web/src/app/app/_controllers/ThreadController/ThreadControllerChartView/ThreadControllerChart.tsx b/web/src/app/app/_controllers/ThreadController/ThreadControllerChartView/ThreadControllerChart.tsx
index cd8098919..ad6806883 100644
--- a/web/src/app/app/_controllers/ThreadController/ThreadControllerChartView/ThreadControllerChart.tsx
+++ b/web/src/app/app/_controllers/ThreadController/ThreadControllerChartView/ThreadControllerChart.tsx
@@ -51,7 +51,7 @@ export const ThreadControllerChart: React.FC<{
         };
       }
 
-      return isTable && !loading && !chartErrorMessage
+      return isTable && !loading && !chartErrorMessage && (selectedData?.length ?? 0) > 0
         ? {
             maxHeight: 'calc(100% - 20px)'
           }
@@ -59,7 +59,7 @@ export const ThreadControllerChart: React.FC<{
             height: '100%',
             maxHeight: '600px'
           };
-    }, [isTable, chartOnlyView, loading, chartErrorMessage]);
+    }, [isTable, chartOnlyView, loading, chartErrorMessage, selectedData?.length]);
 
     return (
       <div className={`${className} flex h-full w-full flex-col space-y-2.5 overflow-hidden`}>
diff --git a/web/src/app/app/datasets/[datasetId]/permissions/_PermissionDatasetGroups/PermissionDatasetGroups.tsx b/web/src/app/app/datasets/[datasetId]/permissions/_PermissionDatasetGroups/PermissionDatasetGroups.tsx
index a3e38749a..b8aba8226 100644
--- a/web/src/app/app/datasets/[datasetId]/permissions/_PermissionDatasetGroups/PermissionDatasetGroups.tsx
+++ b/web/src/app/app/datasets/[datasetId]/permissions/_PermissionDatasetGroups/PermissionDatasetGroups.tsx
@@ -1,4 +1,4 @@
-import { useListDatasetGroups } from '@/api/busterv2';
+import { useDatasetListDatasetGroups, useListDatasetGroups } from '@/api/busterv2';
 import React, { useState } from 'react';
 import { useDebounceSearch } from '../useDebounceSearch';
 import { useMemoizedFn } from 'ahooks';
@@ -12,7 +12,8 @@ import { NewDatasetGroupModal } from './NewPermissionDatasetGroupModal';
 export const PermissionDatasetGroups: React.FC<{
   datasetId: string;
 }> = React.memo(({ datasetId }) => {
-  const { data: datasetGroups, isFetched: isDatasetGroupsFetched } = useListDatasetGroups();
+  const { data: datasetGroups, isFetched: isDatasetGroupsFetched } =
+    useDatasetListDatasetGroups(datasetId);
   const [isNewDatasetGroupModalOpen, setIsNewDatasetGroupModalOpen] = useState(false);
 
   const { filteredItems, searchText, handleSearchChange } = useDebounceSearch({
diff --git a/web/src/components/charts/BusterChartJS/hooks/useBusterChartJSLegend/useBusterChartJSLegend.ts b/web/src/components/charts/BusterChartJS/hooks/useBusterChartJSLegend/useBusterChartJSLegend.ts
index 1a945bb55..3ce89b4ad 100644
--- a/web/src/components/charts/BusterChartJS/hooks/useBusterChartJSLegend/useBusterChartJSLegend.ts
+++ b/web/src/components/charts/BusterChartJS/hooks/useBusterChartJSLegend/useBusterChartJSLegend.ts
@@ -152,7 +152,6 @@ export const useBusterChartJSLegend = ({
   });
 
   const onLegendItemFocus = useMemoizedFn((item: BusterChartLegendItem) => {
-    //  console.log('onLegendItemFocus', item);
     alert('TODO');
   });
 
diff --git a/web/src/components/charts/LoadingComponents/ChartLoadingComponents.tsx b/web/src/components/charts/LoadingComponents/ChartLoadingComponents.tsx
index 2635ad58d..ed91e5cb3 100644
--- a/web/src/components/charts/LoadingComponents/ChartLoadingComponents.tsx
+++ b/web/src/components/charts/LoadingComponents/ChartLoadingComponents.tsx
@@ -30,7 +30,9 @@ export const NoChartData: React.FC<{
   return (
     <div
       className={busterChartsTwMerge('flex h-full w-full items-center justify-center', className)}>
-      <Text className={busterChartsTwMerge()}>{noDataText}</Text>
+      <Text type="tertiary" className={busterChartsTwMerge()}>
+        {noDataText}
+      </Text>
     </div>
   );
 };