diff --git a/app/Controllers/ClientController.php b/app/Controllers/ClientController.php
index 1bd71ed6..2c79d18b 100755
--- a/app/Controllers/ClientController.php
+++ b/app/Controllers/ClientController.php
@@ -480,11 +480,28 @@ class ClientController extends AdminController
         $this->myLogger->logme('error', 'Client list function called');
         $headerData['tab_name'] = 'Clients';
         $headerData['page_name'] = 'Clients'; // Both Browser Tab name And Page name are same. 
-        $data['clientList'] = $this->clientModel->getCreatedByUserName(1); // passing client_type 
+        //  $data['clientList'] = $this->clientModel->getCreatedByUserName(1); // passing client_type 
         $data['client_rm'] = $this->clientRMModel->getAllClientRM();
         $data['lead_data'] = $this->leadsModel->getLeadForInsertClientList();
+        
+        $rawList = $this->clientModel->getCreatedByUserName(1); 
+        $clientRM = $data['client_rm'];
+        $rmMap = [];
+        foreach ($clientRM as $rm) {
+            $rmMap[$rm->client_id][] = $rm->account_manager;
+        }
+        $data['clientList'] = (!empty($rawList) && is_array($rawList)) ? array_map(function($item) use ($rmMap) {
+            $managers = isset($rmMap[$item->id]) ? implode(", ", $rmMap[$item->id]) : "N/A";
+            return (object) [
+                'id'              => $item->id,
+                'client_name'     => $item->client_name,
+                'short_name'      => $item->short_name,
+                'account_managers' => $managers
+            ];
+        }, $rawList) : [];
 
         // dd($data);
+        // dd($data['clientList']);
 
         echo view('layout/header', $headerData);
         echo view('client_list', $data);
@@ -497,7 +514,22 @@ class ClientController extends AdminController
     public function typeList($id = null)
     {
         try {
-            $data = $this->clientModel->getCreatedByUserName($id); // passing client_type 
+            $rawList = $this->clientModel->getCreatedByUserName($id); // passing client_type 
+            $clientRM = $this->clientRMModel->getAllClientRM();;
+            $rmMap = [];
+            foreach ($clientRM as $rm) {
+                $rmMap[$rm->client_id][] = $rm->account_manager;
+            }
+            $data['clientList'] = (!empty($rawList) && is_array($rawList)) ? array_map(function($item) use ($rmMap) {
+                $managers = isset($rmMap[$item->id]) ? implode(", ", $rmMap[$item->id]) : "N/A";
+                return (object) [
+                    'id'              => $item->id,
+                    'client_name'     => $item->client_name,
+                    'short_name'      => $item->short_name,
+                    'account_managers' => $managers
+                ];
+            }, $rawList) : [];
+
             if (empty($data)) {
                 return $this->response
                     ->setJSON(['status' => 'error', 'message' => 'No Records found'])
@@ -925,6 +957,29 @@ class ClientController extends AdminController
         }
 
         $editData['client_policy']    = $clientPoliceData;
+        //Notes : $editData['client_policy'] this on called in client_policy page 
+        $rawList = $editData['client_policy'];
+
+        $editData['client_policy'] = (!empty($rawList) && is_array($rawList))
+            ? array_values(array_map(function ($item) {
+                    return (object) [
+                        'id'                   => $item->id,
+                        'policy_no'            => $item->policy_no,
+                        'policy_type_name'     => $item->policy_type_name,
+                        'policy_start_date'    => $item->policy_start_date,
+                        'policy_end_date'      => $item->policy_end_date,
+                        'insurer_short'        => $item->insurer_short,
+                        'insurer_branch_name'  => $item->insurer_branch_name,
+                        'branch_name'          => $item->branch_name ?? ' - ',
+                        'tpa_short'            => $item->tpa_short,
+                        'policy_type_name'     => $item->policy_type_name,
+                        'policy_type_id'       => $item->policy_type_id,
+                        'lead_cd_amount'       => $item->lead_cd_amount,
+                        'tpa_branch_code'      => $item->tpa_branch_code,
+                        'branch_name'          => $item->branch_name ?? ' - ',
+                        'policy_type_id'       => $item->policy_type_id,
+                    ];
+                }, $rawList)) : [];
         $editData['client_policy']['role'] = get_role_id();
         $editData['notification'] = $this->notificationModel->select('template_name,enabled')->where('client_id', $id)->findAll();
         $editData['placeHolders'] = ['member_name', 'member_mobile', 'nhance_logo', 'tpa_id', 'ecard_download_link', 'client_logo', 'policy_no', 'member_summary', 'app_link', 'post_enrollment_app_link', 'client_name'];
diff --git a/app/Controllers/EmployeeController.php b/app/Controllers/EmployeeController.php
index b662d8b1..c49e1dfa 100755
--- a/app/Controllers/EmployeeController.php
+++ b/app/Controllers/EmployeeController.php
@@ -841,6 +841,7 @@ class EmployeeController extends AdminController
     {
 
         $data = [];
+        
         $data['status'] = ['pending' => 'Pending', 'inprogress' => 'In-Progress', 'complete' => 'Complete'];
         if (count($this->request->getGet())) {
             $filterData = $this->request->getGet();
@@ -850,9 +851,9 @@ class EmployeeController extends AdminController
                 status: $filterData['status'],
                 branch_id: $filterData['branch_id']
             );
-                        $data['getData'] = $filterData;
+            $data['getData'] = $filterData;
             // echo "<pre>";
-            // print_r($data); die;
+            
         }
 
         $this->myLogger->logme('error', 'list called');
diff --git a/app/Controllers/MasterController.php b/app/Controllers/MasterController.php
index 610d6de2..7c46bc9a 100755
--- a/app/Controllers/MasterController.php
+++ b/app/Controllers/MasterController.php
@@ -320,7 +320,6 @@ class MasterController extends AdminController
         $uploadFilePath = ROOTPATH . 'public/uploads/logo/';
         $file_name = file_Upload($this->request->getFile('insurer_logo'), $uploadFilePath);
         $data   = $this->request->getPost();
-        print_r($data);die;
         $sanitized_post_data = sanitizeInputArrayAdvanced($data);
 
         $sanitized_post_data['addition_add_day'] = (!empty($sanitized_post_data['addition_add_day'])) ? 1 : 0;
diff --git a/app/Controllers/TicketController.php b/app/Controllers/TicketController.php
index 59307eac..1dbe0636 100644
--- a/app/Controllers/TicketController.php
+++ b/app/Controllers/TicketController.php
@@ -424,7 +424,6 @@ class TicketController extends BaseController
 
             return $this->loadLayout('ticket_search', $data);
         } else {
-
             $isFromDashboard = $this->request->getPost("is_dashboard");
             log_message('error', 'Is From Dashboard: ' . $isFromDashboard);
 
@@ -446,7 +445,6 @@ class TicketController extends BaseController
                 }
                 $data['claim_status'] = $this->claimStatus->select('id,ticket_type,claim_status')->where('is_active', 1)->findAll();
                 $data['client_list'] = $this->clientModel->select('id,client_name')->where('is_active', 1)->findAll();
-                // dd($data);
                 return $this->loadLayout('ticket_search', $data);
 
             }
diff --git a/app/Views/client_api.php b/app/Views/client_api.php
index e57051f4..7cfd1ae7 100644
--- a/app/Views/client_api.php
+++ b/app/Views/client_api.php
@@ -57,7 +57,7 @@
                         <td>Get Branch Wise Employee Data</td>
                         <td><?= base_url("getClientBranchEmpData") ?></td>
                     </tr>
-                </table>
+                </table>-->
             
                     
                     <!-- Enter Token Section -->
diff --git a/app/Views/client_list.php b/app/Views/client_list.php
index c9b5a2b7..8169b0b0 100755
--- a/app/Views/client_list.php
+++ b/app/Views/client_list.php
@@ -102,7 +102,7 @@ table.dataTable thead th {
                         <tr >
                             <td class="text-center"><?=$index+1?></td>
                             <td class="client_info" data-id="<?php echo $row->id; ?>"><?php echo $row->client_name; ?> ( <?php echo $row->short_name; ?> ) </td>
-                            <td>
+                            <!-- <td>
                                 <?php $account_managers = ''; ?>
                                 <?php foreach ($client_rm as $client): ?>
                                     <?php if ($client->client_id == $row->id): ?>
@@ -112,6 +112,9 @@ table.dataTable thead th {
                                 <?php 
                                  $account_managers = rtrim($account_managers, ', ');
                                  echo $account_managers !== '' ? $account_managers : 'N/A'; ?> 
+                            </td> -->
+                            <td>
+                                <?= $row->account_managers ?>
                             </td>
                             <td>
                                 <div class="btn-group dropdown">
@@ -389,8 +392,10 @@ $(document).ready(function()
                         method: 'GET',
                         success: function(response) {
                             if (response.status === "success" && Array.isArray(response.data)) {
+                                console.error("#CL 1 : ", response.data);
                                 renderRows(response.data);
                             } else {
+                                console.error("#CL 2 : ", response.data);
                                 renderRows([]);
                             }
                         },
@@ -407,21 +412,21 @@ $(document).ready(function()
         table.clear();
         if (Array.isArray(data) && data.length) {
             data.forEach((row, index) => {
-                let clientrm = <?= json_encode($client_rm) ?>;
-                let account_managers = "";
-
-                clientrm.forEach(client => {
-                    if (client.client_id == row.id) {
-                        account_managers += client.account_manager + ", ";
-                    }
-                });
-                account_managers = account_managers.replace(/,\s*$/, "");
-                if (account_managers === "") account_managers = "N/A";
+                // let clientrm =  json_encode($client_rm) 
+                // let account_managers = "";
+                // 
+                // clientrm.forEach(client => {
+                //     if (client.client_id == row.id) {
+                //         account_managers += client.account_manager + ", ";
+                //     }
+                // });
+                // account_managers = account_managers.replace(/,\s*$/, "");
+                // if (account_managers === "") account_managers = "N/A";
 
                 let rowData = [
                     index + 1,
                     `<span class="client_info" data-id="${row.id}">${row.client_name} (${row.short_name})</span>`,
-                    account_managers,                
+                    row.account_managers,                
                     `<div class="btn-group dropdown">
                         <a href="javascript:void(0);" class="dropdown-toggle arrow-none btn btn-light btn-sm" data-toggle="dropdown">
                             <i class="mdi mdi-dots-horizontal"></i>
diff --git a/app/Views/test_members_list.php b/app/Views/test_members_list.php
index 6cdb1d5d..93fbe9d7 100644
--- a/app/Views/test_members_list.php
+++ b/app/Views/test_members_list.php
@@ -270,6 +270,7 @@ th:first-child, td:first-child {
                             <th><?php echo format_indian_number($gst_total); ?></th> -->
                             <th></th>
                         </tr> */ ?>
+                        </tr>
                     </tfoot>
                 </table>
             </div>
diff --git a/app/Views/ticket_type_modal.php b/app/Views/ticket_type_modal.php
index 2e7fdf82..dfac9d56 100644
--- a/app/Views/ticket_type_modal.php
+++ b/app/Views/ticket_type_modal.php
@@ -22,7 +22,7 @@
             <div class="modal-body">
                 <div class="form-row">
                     <div class="form-group col-md-12">
-                        <label for="ticket_type"> Policy Type <span class="text-danger"></span></label>
+                        <label> Policy Type <span class="text-danger"></span></label>
                         <select class="form-control" id="openTicketTypeAskModal">
                             <option value="1">Claim-GMC</option>
                             <option value="2">Claim-GPA</option>