diff --git a/src/renderer/Grid/DatePickerInline.tsx b/src/renderer/Grid/DatePickerInline.tsx
index e9930eb5..25bc29be 100644
--- a/src/renderer/Grid/DatePickerInline.tsx
+++ b/src/renderer/Grid/DatePickerInline.tsx
@@ -66,7 +66,7 @@ const DatePickerInline: React.FC<Props> = ({
           <Button id={props.id} disabled={disabled} ref={ref} aria-label={ariaLabel} tabIndex={-1}>
             <Badge variant="dot" invisible={mustNotify}>
               <Chip
-                onClick={() => handleFilterSelect(type, formattedValue, [date], filters, false)}
+                onClick={() => handleFilterSelect(type, formattedValue, date, filters, false)}
                 label={chipText}
                 data-testid={`datagrid-button-${type}`}
                 tabIndex={0}
diff --git a/src/renderer/Grid/Renderer.tsx b/src/renderer/Grid/Renderer.tsx
index 7d717427..45864eb5 100644
--- a/src/renderer/Grid/Renderer.tsx
+++ b/src/renderer/Grid/Renderer.tsx
@@ -61,23 +61,23 @@ const RendererComponent: React.FC<RendererComponentProps> = memo(({
 		  />
 		),
 		contexts: (value, type) => (
-		  <Button className='contexts' onClick={() => handleButtonClick(type, value, [value])} data-testid={`datagrid-button-${type}`}>
+		  <Button className='contexts' onClick={() => handleButtonClick(type, value, value)} data-testid={`datagrid-button-${type}`}>
 		    {value}
 		  </Button>
 		),
 		projects: (value, type) => (
-		  <Button onClick={() => handleButtonClick(type, value, [value])} data-testid={`datagrid-button-${type}`}>
+		  <Button onClick={() => handleButtonClick(type, value, value)} data-testid={`datagrid-button-${type}`}>
 		    {value}
 		  </Button>
 		),
 		rec: (value, type) => (
-		  <Button onClick={() => handleButtonClick(type, value, [value])} data-testid={`datagrid-button-${type}`}>
+		  <Button onClick={() => handleButtonClick(type, value, value)} data-testid={`datagrid-button-${type}`}>
 		    <Chip label="rec:" />
 		    {value}
 		  </Button>
 		),
 		pm: (value, type) => (
-		  <Button className='pomodoro' onClick={() => handleButtonClick(type, value, [value])} data-testid={`datagrid-button-${type}`}>
+		  <Button className='pomodoro' onClick={() => handleButtonClick(type, value, value)} data-testid={`datagrid-button-${type}`}>
 		    <TomatoIconDuo />
 		    {value}
 		  </Button>
diff --git a/src/renderer/Shared.tsx b/src/renderer/Shared.tsx
index e8b86b06..b3f3ad44 100644
--- a/src/renderer/Shared.tsx
+++ b/src/renderer/Shared.tsx
@@ -16,16 +16,18 @@ export const handleFilterSelect = (key: string, name: string, values: string | s
     const updatedFilters: Filters = { ...filters };
     const filterList: Filter[] = updatedFilters[key] || [];
 
+    const normalizedValues = typeof values === 'string' ? [values] : values;
+
     const filterIndex = filterList.findIndex((filter: Filter) => {
-      return Array.isArray(values) && Array.isArray(filter.values) ? 
-        values.every(v => filter.values.includes(v)) : 
-        filter.values === values;
+      return Array.isArray(normalizedValues) && Array.isArray(filter.values) ? 
+        normalizedValues.every(v => filter.values.includes(v)) : 
+        filter.values === normalizedValues;
     });
 
     if (filterIndex !== -1) {
       filterList.splice(filterIndex, 1);
     } else {
-      filterList.push({ name, values, exclude });
+      filterList.push({ name, values: normalizedValues, exclude });
     }
 
     updatedFilters[key] = filterList;
@@ -35,6 +37,7 @@ export const handleFilterSelect = (key: string, name: string, values: string | s
   }
 };
 
+
 export const handleLinkClick = (event: MouseEvent, url: string) => {
   event.preventDefault();
   event.stopPropagation();