diff --git a/src/composables/useRouteFilters.ts b/src/composables/useRouteFilters.ts
index 5d9bb891a..75d0903f3 100644
--- a/src/composables/useRouteFilters.ts
+++ b/src/composables/useRouteFilters.ts
@@ -16,16 +16,23 @@ export function useRouteFilters<CurrentFilters extends Filters>(
 
 	const routeFromFiltersFullPath = computed(() => router.resolve(filtersToRoute(filters.value)).fullPath)
 
-	watch(() => route.value, (route, oldRoute) => {
-		if (
-			(route && oldRoute && typeof route.name !== 'undefined' && typeof oldRoute.name !== 'undefined' && route.name !== oldRoute.name) ||
-			routeFromFiltersFullPath.value === route.fullPath
-		) {
-			return
-		}
+	watch(
+		route,
+		(route, oldRoute) => {
+			if (
+				route?.name !== oldRoute?.name ||
+				routeFromFiltersFullPath.value === route.fullPath
+			) {
+				return
+			}
 
-		filters.value = routeToFilters(route)
-	})
+			filters.value = routeToFilters(route)
+		},
+		{
+			deep: true,
+			immediate: true, // set the filter from the initial route
+		},
+	)
 
 	watch(
 		filters,
@@ -35,12 +42,23 @@ export function useRouteFilters<CurrentFilters extends Filters>(
 			}
 		},
 		// only apply new route after all filters have changed in component cycle
-		{flush: 'post'},
+		{
+			deep: true,
+			flush: 'post',
+		},
 	)
 
-	const hasDefaultFilters = computed(() => {
-		return equal(filters.value, getDefaultFilters(route.value))
-	})
+	const hasDefaultFilters = ref(false)
+	watch(
+		[filters, route],
+		([filters, route]) => {
+			hasDefaultFilters.value = equal(filters, getDefaultFilters(route))
+		},
+		{
+			deep: true,
+			immediate: true,
+		},
+	)
 
 	function setDefaultFilters() {
 		filters.value = getDefaultFilters(route.value)
diff --git a/src/helpers/time/isoToKebabDate.ts b/src/helpers/time/isoToKebabDate.ts
index b9ec26c52..54290a035 100644
--- a/src/helpers/time/isoToKebabDate.ts
+++ b/src/helpers/time/isoToKebabDate.ts
@@ -1,8 +1,16 @@
-import {format} from 'date-fns'
-import {DATEFNS_DATE_FORMAT_KEBAB} from '@/constants/date' 
 import type {DateISO} from '@/types/DateISO'
 import type {DateKebab} from '@/types/DateKebab'
 
+// ✅ Format a date to YYYY-MM-DD (or any other format)
+function padTo2Digits(num: number) {
+  return num.toString().padStart(2, '0')
+}
+
 export function isoToKebabDate(isoDate: DateISO) {
-	return format(new Date(isoDate), DATEFNS_DATE_FORMAT_KEBAB) as DateKebab
+	const date = new Date(isoDate)
+	return [
+		date.getFullYear(),
+		padTo2Digits(date.getMonth() + 1), // January is 0, but we want it to be 1
+		padTo2Digits(date.getDate()),
+	].join('-') as DateKebab
 }
\ No newline at end of file
diff --git a/src/helpers/time/parseDateProp.ts b/src/helpers/time/parseDateProp.ts
index 9e426df25..bf3be0984 100644
--- a/src/helpers/time/parseDateProp.ts
+++ b/src/helpers/time/parseDateProp.ts
@@ -22,7 +22,7 @@ export function parseDateProp(kebabDate: DateKebab | undefined): string | undefi
 		if (!dateValuesAreValid) {
 			throw new Error('Invalid date values')
 		}
-		return new Date(year, month, date).toISOString() as DateISO
+		return new Date(year, month - 1, date).toISOString() as DateISO
 	} catch(e) {
 		// ignore nonsense route queries
 		return
diff --git a/src/views/list/ListGantt.vue b/src/views/list/ListGantt.vue
index b46b42819..5ffa9a255 100644
--- a/src/views/list/ListGantt.vue
+++ b/src/views/list/ListGantt.vue
@@ -88,9 +88,15 @@ const {
 	updateTask,
 } = useGanttFilters(route)
 
-const today = new Date(new Date().setHours(0,0,0,0))
-const defaultTaskStartDate: DateISO = new Date(today).toISOString()
-const defaultTaskEndDate: DateISO = new Date(today.getFullYear(), today.getMonth(), today.getDate() + 7, 23,59,0,0).toISOString()
+const DEFAULT_DATE_RANGE_DAYS = 7
+
+const today = new Date()
+const defaultTaskStartDate: DateISO = new Date(today.setHours(0, 0, 0, 0)).toISOString()
+const defaultTaskEndDate: DateISO = new Date(new Date(
+	today.getFullYear(),
+	today.getMonth(),
+	today.getDate() + DEFAULT_DATE_RANGE_DAYS,
+).setHours(23, 59, 0, 0)).toISOString()
 
 async function addGanttTask(title: ITask['title']) {
 	return await addTask({
diff --git a/src/views/list/helpers/useGanttFilters.ts b/src/views/list/helpers/useGanttFilters.ts
index ef65621b7..91d6db77d 100644
--- a/src/views/list/helpers/useGanttFilters.ts
+++ b/src/views/list/helpers/useGanttFilters.ts
@@ -98,8 +98,8 @@ export function useGanttFilters(route: Ref<RouteLocationNormalized>): UseGanttFi
 		setDefaultFilters,
 	} = useRouteFilters<GanttFilters>(
 		route,
-		ganttRouteToFilters,
 		ganttGetDefaultFilters,
+		ganttRouteToFilters,
 		ganttFiltersToRoute,
 	)