diff --git a/components/flow.tsx b/components/flow.tsx
index a9863b73..7571c070 100644
--- a/components/flow.tsx
+++ b/components/flow.tsx
@@ -95,54 +95,28 @@ export function Flow() {
         return;
       }
 
-      // Log the raw API response
-      console.log('Raw API response:', {
-        taskCount: data.tasks.length,
-        firstTask: data.tasks[0],
-        taskFields: Object.keys(data.tasks[0])
-      });
-
-      // Debug log to see all tasks and their dates
+      // Debug log to see raw task data
       data.tasks.forEach((task: Task) => {
-        // Log the complete task object first
-        console.log(`Task ${task.id} - Complete data:`, {
-          id: task.id,
+        console.log(`Task ${task.id} - Raw data:`, {
           headline: task.headline,
           dateToFinish: task.dateToFinish,
           date: task.date,
-          status: task.status,
-          editorId: task.editorId,
-          projectName: task.projectName
+          status: task.status
         });
       });
 
       const getValidDate = (task: Task): Date | undefined => {
-        // First try dateToFinish as it's the primary due date field
-        const rawDateToFinish = task.dateToFinish;
-        console.log(`Task ${task.id} - Raw dateToFinish:`, {
-          value: rawDateToFinish,
-          type: typeof rawDateToFinish,
-          hasValue: !!rawDateToFinish
-        });
-        
-        if (rawDateToFinish && rawDateToFinish !== '0000-00-00 00:00:00') {
-          const date = new Date(rawDateToFinish);
-          const isValid = !isNaN(date.getTime());
-          console.log(`Task ${task.id} - Date parsing result:`, {
-            input: rawDateToFinish,
-            parsed: date.toISOString(),
-            isValid: isValid
-          });
-          
-          if (isValid) {
+        // First check dateToFinish
+        if (task.dateToFinish && task.dateToFinish !== '0000-00-00 00:00:00') {
+          const date = new Date(task.dateToFinish);
+          if (!isNaN(date.getTime())) {
             return date;
           }
         }
         
-        // Then try date field as fallback
-        const rawDate = task.date;
-        if (rawDate && rawDate !== '0000-00-00 00:00:00') {
-          const date = new Date(rawDate);
+        // Then check date field
+        if (task.date && task.date !== '0000-00-00 00:00:00') {
+          const date = new Date(task.date);
           if (!isNaN(date.getTime())) {
             return date;
           }
@@ -151,40 +125,38 @@ export function Flow() {
         return undefined;
       };
 
-      // Process and sort tasks - only non-completed tasks
+      // Process tasks - exclude completed tasks and get valid dates
       const processedTasks = data.tasks
         .filter((task: Task) => task.status !== 5) // Exclude completed tasks
         .map((task: Task): TaskWithDate => {
           const validDate = getValidDate(task);
-          console.log(`Task ${task.id} - Final processing:`, {
+          console.log(`Task ${task.id} - Processing:`, {
             headline: task.headline,
             dateToFinish: task.dateToFinish,
+            date: task.date,
             validDate: validDate?.toISOString(),
-            status: task.status,
-            hasValidDate: !!validDate
+            status: task.status
           });
           return { ...task, validDate };
         });
 
-      // Sort tasks by date (tasks with dates come first)
+      // Sort tasks by date
       const sortedTasks = processedTasks
         .sort((a: TaskWithDate, b: TaskWithDate) => {
-          if (a.validDate && b.validDate) {
-            return a.validDate.getTime() - b.validDate.getTime();
-          }
-          if (!a.validDate && !b.validDate) {
-            return 0; // Keep original order for tasks without dates
-          }
-          return a.validDate ? -1 : 1; // Tasks with dates come first
+          if (!a.validDate && !b.validDate) return 0;
+          if (!a.validDate) return 1;
+          if (!b.validDate) return -1;
+          return a.validDate.getTime() - b.validDate.getTime();
         })
-        .slice(0, 6); // Only take the first 6 tasks
+        .slice(0, 6); // Take first 6 tasks
 
       console.log('Final sorted tasks:', sortedTasks.map((t: TaskWithDate) => ({
         id: t.id,
         headline: t.headline,
+        dateToFinish: t.dateToFinish,
+        date: t.date,
         validDate: t.validDate?.toISOString(),
-        status: t.status,
-        dateToFinish: t.dateToFinish
+        status: t.status
       })));
 
       setTasks(sortedTasks);
@@ -201,7 +173,7 @@ export function Flow() {
   }, []);
 
   // Update the date display component
-  const TaskDate = ({ task }: { task: Task & { validDate?: Date } }) => {
+  const TaskDate = ({ task }: { task: TaskWithDate }) => {
     const today = new Date();
     today.setHours(0, 0, 0, 0);