diff --git a/app/Controllers/EmployeeController.php b/app/Controllers/EmployeeController.php
index 62ad0c59..66e856b1 100755
--- a/app/Controllers/EmployeeController.php
+++ b/app/Controllers/EmployeeController.php
@@ -3374,15 +3374,18 @@ class EmployeeController extends AdminController
             ->where('employee_polices.wellness_onboard', '0')
             ->where('emp.emp_status', 'active')
             ->where('emp.is_active', 1)
-            ->where('cp.wellness_plan_id is not null',null,false)
-            ->where('cp.wellness_plan_id !=',"")
-            ->where('cp.wellness_plan_id !=',0)
-            
-            ->where('cp.wellness_vendor_id is null')
-            ->where('cp.wellness_vendor_id !=',0)
-            ->where('cp.wellness_vendor_id !=',"")
-            // ->where('cp.policy_status',1)
-            // ->where('cp.is_active',1)
+           ->groupStart()
+                ->where('cp.wellness_plan_id IS NOT NULL', null, false)
+                ->orWhere('cp.wellness_plan_id !=', '')
+                ->orWhere('cp.wellness_plan_id !=', 0)
+            ->groupEnd()
+            ->groupStart()
+                ->where('cp.wellness_vendor_id IS NULL', null, false)
+                ->orWhere('cp.wellness_vendor_id =', '')
+                ->orWhere('cp.wellness_vendor_id =', 0)
+            ->groupEnd()
+            ->where('cp.policy_status',1)
+            ->where('cp.is_active',1)
             ->findAll();
             // echo count($data);die();
             // if(is_array($data) && count($data))
diff --git a/app/Controllers/ThzController.php b/app/Controllers/ThzController.php
index 0d152a31..a2427b07 100644
--- a/app/Controllers/ThzController.php
+++ b/app/Controllers/ThzController.php
@@ -234,8 +234,24 @@ class ThzController extends BaseController
                 ->where('thz_master.thz_id', $thz_id)
                 ->findAll();
 
+                $clientId = $result['master'][0]['client_id'];
+                
+                $accManagerId = $this->getAcmIdUsingClientId($clientId ?? null);
+               
+                $accManager = $this->userModel->find($accManagerId);
+
             if (!empty($result['master'])) {
                 $notes = $this->thzMasterNotesModel->ticketConversationList($thz_id, $returnType);
+                $accManagerName = $accManager['first_name'] ?? '';
+
+                foreach ($notes as &$note) {
+
+                    if (empty($note['name'])) {
+                        $note['name'] = $accManagerName;
+                    }
+                }
+
+                unset($note);
                 $result['notes'] = !empty($notes) ? $notes : [];
             } else {
                 $this->myLogger->logme('error', 'No tickets found for ticket id ' . json_encode($thz_id));