diff --git a/src/app/(main)/App.tsx b/src/app/(main)/App.tsx
index ec08838d1..33f0e1f36 100644
--- a/src/app/(main)/App.tsx
+++ b/src/app/(main)/App.tsx
@@ -5,11 +5,22 @@ import { UpdateNotice } from './UpdateNotice';
 import { SideNav } from '@/app/(main)/SideNav';
 import { useLoginQuery, useConfig, useNavigation } from '@/components/hooks';
 import { MobileNav } from '@/app/(main)/MobileNav';
+import { useEffect } from 'react';
+import { removeItem, setItem } from '@/lib/storage';
+import { LAST_TEAM_CONFIG } from '@/lib/constants';
 
 export function App({ children }) {
   const { user, isLoading, error } = useLoginQuery();
   const config = useConfig();
-  const { pathname } = useNavigation();
+  const { pathname, teamId } = useNavigation();
+
+  useEffect(() => {
+    if (teamId) {
+      setItem(LAST_TEAM_CONFIG, teamId);
+    } else {
+      removeItem(LAST_TEAM_CONFIG);
+    }
+  }, [teamId]);
 
   if (isLoading || !config) {
     return <Loading placement="absolute" />;
diff --git a/src/app/(main)/websites/[websiteId]/(reports)/funnels/FunnelEditForm.tsx b/src/app/(main)/websites/[websiteId]/(reports)/funnels/FunnelEditForm.tsx
index 30976bff7..13712f2ad 100644
--- a/src/app/(main)/websites/[websiteId]/(reports)/funnels/FunnelEditForm.tsx
+++ b/src/app/(main)/websites/[websiteId]/(reports)/funnels/FunnelEditForm.tsx
@@ -56,7 +56,7 @@ export function FunnelEditForm({
   const defaultValues = {
     name: data?.name || '',
     window: data?.parameters?.window || 60,
-    steps: data?.parameters?.steps || [{ type: 'path', value: '/' }],
+    steps: data?.parameters?.steps || [{ type: 'path', value: '' }],
   };
 
   return (
@@ -82,12 +82,10 @@ export function FunnelEditForm({
           validate: value => value.length > 1 || 'At least two steps are required',
         }}
       >
-        {({ fields, append, remove, getValues }) => {
+        {({ fields, append, remove }) => {
           return (
             <Grid gap>
               {fields.map(({ id }: { id: string }, index: number) => {
-                const type = getValues(`steps.${index}.type`);
-
                 return (
                   <Grid key={id} columns="260px 1fr auto" gap>
                     <Column>
@@ -103,7 +101,8 @@ export function FunnelEditForm({
                         name={`steps.${index}.value`}
                         rules={{ required: formatMessage(labels.required) }}
                       >
-                        {({ field }) => {
+                        {({ field, context }) => {
+                          const type = context.watch(`steps.${index}.type`);
                           return <LookupField websiteId={websiteId} type={type} {...field} />;
                         }}
                       </FormField>
@@ -118,7 +117,7 @@ export function FunnelEditForm({
               })}
               <Row>
                 <Button
-                  onPress={() => append({ type: 'path', value: '/' })}
+                  onPress={() => append({ type: 'path', value: '' })}
                   isDisabled={fields.length >= FUNNEL_STEPS_MAX}
                 >
                   <Icon>
diff --git a/src/app/(main)/websites/[websiteId]/(reports)/goals/GoalAddButton.tsx b/src/app/(main)/websites/[websiteId]/(reports)/goals/GoalAddButton.tsx
index f5fec7b0e..c75d72b02 100644
--- a/src/app/(main)/websites/[websiteId]/(reports)/goals/GoalAddButton.tsx
+++ b/src/app/(main)/websites/[websiteId]/(reports)/goals/GoalAddButton.tsx
@@ -17,9 +17,8 @@ export function GoalAddButton({ websiteId }: { websiteId: string }) {
       <Modal>
         <Dialog
           aria-label="add goal"
-          variant="modal"
           title={formatMessage(labels.goal)}
-          style={{ minWidth: 800, minHeight: 300 }}
+          style={{ minWidth: 400, minHeight: 300 }}
         >
           {({ close }) => <GoalEditForm websiteId={websiteId} onClose={close} />}
         </Dialog>
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 8249e1849..8bf748f9b 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -1,5 +1,21 @@
+'use client';
+import { useEffect } from 'react';
 import { redirect } from 'next/navigation';
+import { getItem, removeItem } from '@/lib/storage';
+import { LAST_TEAM_CONFIG } from '@/lib/constants';
 
 export default function RootPage() {
-  redirect('/websites');
+  useEffect(() => {
+    const lastTeam = getItem(LAST_TEAM_CONFIG);
+
+    if (lastTeam) {
+      redirect(`/teams/${lastTeam}/websites`);
+    } else {
+      removeItem(LAST_TEAM_CONFIG);
+
+      redirect(`/websites`);
+    }
+  }, []);
+
+  return null;
 }
diff --git a/src/components/common/DateDistance.tsx b/src/components/common/DateDistance.tsx
index b305f857f..65bec3870 100644
--- a/src/components/common/DateDistance.tsx
+++ b/src/components/common/DateDistance.tsx
@@ -1,13 +1,18 @@
 import { Text } from '@umami/react-zen';
 import { formatDistanceToNow } from 'date-fns';
 import { useLocale, useTimezone } from '@/components/hooks';
+import { isInvalidDate } from '@/lib/date';
 
 export function DateDistance({ date }: { date: Date }) {
   const { formatTimezoneDate } = useTimezone();
   const { dateLocale } = useLocale();
 
+  if (!isInvalidDate(date)) {
+    return null;
+  }
+
   return (
-    <Text title={formatTimezoneDate(date.toISOString(), 'PPPpp')}>
+    <Text title={formatTimezoneDate(date?.toISOString(), 'PPPpp')}>
       {formatDistanceToNow(date, { addSuffix: true, locale: dateLocale })}
     </Text>
   );
diff --git a/src/lib/constants.ts b/src/lib/constants.ts
index 195fe1be8..e5090c3c0 100644
--- a/src/lib/constants.ts
+++ b/src/lib/constants.ts
@@ -5,6 +5,7 @@ export const TIMEZONE_CONFIG = 'umami.timezone';
 export const DATE_RANGE_CONFIG = 'umami.date-range';
 export const THEME_CONFIG = 'umami.theme';
 export const DASHBOARD_CONFIG = 'umami.dashboard';
+export const LAST_TEAM_CONFIG = 'umami.last-team';
 export const VERSION_CHECK = 'umami.version-check';
 export const SHARE_TOKEN_HEADER = 'x-umami-share-token';
 export const HOMEPAGE_URL = 'https://umami.is';
diff --git a/src/lib/date.ts b/src/lib/date.ts
index 81b70c62c..f0f54de41 100644
--- a/src/lib/date.ts
+++ b/src/lib/date.ts
@@ -369,3 +369,7 @@ export function getDateRangeValue(startDate: Date, endDate: Date) {
 export function getMonthDateRangeValue(date: Date) {
   return getDateRangeValue(startOfMonth(date), endOfMonth(date));
 }
+
+export function isInvalidDate(date: any) {
+  return date instanceof Date && isNaN(date.getTime());
+}
diff --git a/src/queries/sql/reports/getJourney.ts b/src/queries/sql/reports/getJourney.ts
index 8d1a90d45..51e0d16f0 100644
--- a/src/queries/sql/reports/getJourney.ts
+++ b/src/queries/sql/reports/getJourney.ts
@@ -73,7 +73,7 @@ async function relationalQuery(
     for (let i = 1; i <= steps; i++) {
       const endQuery = i < steps ? ',' : '';
       selectQuery += `s.e${i},`;
-      maxQuery += `\nmax(CASE WHEN event_number = ${i} THEN event ELSE NULL END) AS e${i}${endQuery}`;
+      maxQuery += `\nmax(CASE WHEN event_number = ${i} THEN "event" ELSE NULL END) AS e${i}${endQuery}`;
       groupByQuery += `s.e${i}${endQuery} `;
     }
 
@@ -185,7 +185,7 @@ async function clickhouseQuery(
     for (let i = 1; i <= steps; i++) {
       const endQuery = i < steps ? ',' : '';
       selectQuery += `s.e${i},`;
-      maxQuery += `\nmax(CASE WHEN event_number = ${i} THEN event ELSE NULL END) AS e${i}${endQuery}`;
+      maxQuery += `\nmax(CASE WHEN event_number = ${i} THEN "event" ELSE NULL END) AS e${i}${endQuery}`;
       groupByQuery += `s.e${i}${endQuery} `;
     }
 
@@ -230,7 +230,7 @@ async function clickhouseQuery(
     WITH events AS (
       select distinct
           visit_id,
-          coalesce(nullIf(event_name, ''), url_path) event,
+          coalesce(nullIf(event_name, ''), url_path) "event",
           row_number() OVER (PARTITION BY visit_id ORDER BY created_at) AS event_number
       from website_event
       ${cohortQuery}