diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Cases/Participated.php b/workflow/engine/src/ProcessMaker/BusinessModel/Cases/Participated.php
index 36f2c276e..d6e476ef1 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Cases/Participated.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Cases/Participated.php
@@ -188,7 +188,7 @@ class Participated extends AbstractCases
                         $result[$i]['tas_title'] = $item['TAS_TITLE'];
                         $result[$i]['user_id'] = $item['USR_ID'];
                         $result[$i]['due_date'] = $item['DEL_TASK_DUE_DATE'];
-                        $result[$i]['tas_color'] = (!empty($thread['DEL_TASK_DUE_DATE'])) ? $this->getTaskColor($item['DEL_TASK_DUE_DATE']) : '';
+                        $result[$i]['tas_color'] = (!empty($item['DEL_TASK_DUE_DATE'])) ? $this->getTaskColor($item['DEL_TASK_DUE_DATE']) : '';
                         $result[$i]['tas_color_label'] = (!empty($result[$i]['tas_color'])) ? self::TASK_COLORS[$result[$i]['tas_color']] : '';
                         $item['PENDING'] = $result;
                     }
@@ -206,7 +206,7 @@ class Participated extends AbstractCases
                     $result[$i]['tas_title'] = $item['TAS_TITLE'];
                     $result[$i]['user_id'] = $item['USR_ID'];
                     $result[$i]['due_date'] = $item['DEL_TASK_DUE_DATE'];
-                    $result[$i]['tas_color'] = (!empty($thread['DEL_TASK_DUE_DATE'])) ? $this->getTaskColor($item['DEL_TASK_DUE_DATE']) : '';
+                    $result[$i]['tas_color'] = (!empty($item['DEL_TASK_DUE_DATE'])) ? $this->getTaskColor($item['DEL_TASK_DUE_DATE']) : '';
                     $result[$i]['tas_color_label'] = (!empty($result[$i]['tas_color'])) ? self::TASK_COLORS[$result[$i]['tas_color']] : '';
                     $item['PENDING'] = $result;
                     break;
diff --git a/workflow/engine/src/ProcessMaker/Model/Delegation.php b/workflow/engine/src/ProcessMaker/Model/Delegation.php
index 4b44a12de..f3158f1c5 100644
--- a/workflow/engine/src/ProcessMaker/Model/Delegation.php
+++ b/workflow/engine/src/ProcessMaker/Model/Delegation.php
@@ -1872,8 +1872,11 @@ class Delegation extends Model
             'USERS.USR_FIRSTNAME', // Current User FirstName
             'USERS.USR_LASTNAME', // Current User LastName
             'APP_DELEGATION.DEL_TASK_DUE_DATE', // Due Date
+            // Additional column for other functionalities
             'APP_DELEGATION.APP_UID', // Case Uid for Open case
             'APP_DELEGATION.DEL_INDEX', // Del Index for Open case
+            'APP_DELEGATION.PRO_UID', // Process Uid for Case notes
+            'APP_DELEGATION.TAS_UID', // Task Uid for Case notes
         ]);
         // Join with task
         $query->joinTask();