diff --git a/app/Controllers/LeadsController.php b/app/Controllers/LeadsController.php
index 59a9dea4..56f7f1d0 100644
--- a/app/Controllers/LeadsController.php
+++ b/app/Controllers/LeadsController.php
@@ -1280,8 +1280,8 @@ class LeadsController extends BaseController
                     'No of Employees at Inception' => $rfq_data['incept_emp_count'],
                     'Total Sum Insured at Inception ' => $rfq_data['total_si_at_incept'],
                     'Policy Period' => !empty($rfq_data['policy_start_date']) && !empty($rfq_data['policy_end_date']) ? date('d-m-Y', strtotime($rfq_data['policy_start_date'])) . ' to ' . date('d-m-Y', strtotime($rfq_data['policy_end_date'])) : "To be decided",
-                    'Insurer' => $rfq_data['insurer_name'] ?? " - ",
-                    'TPA' => $rfq_data['tpa_name'] ?? " - ",
+                    // 'Insurer' => $rfq_data['insurer_name'] ?? " - ",
+                    // 'TPA' => $rfq_data['tpa_name'] ?? " - ",
                     'Policy Type' => $this->leadType[$rfq_data['lead_type']] ?? "",
                 ];
             }
@@ -1322,11 +1322,11 @@ class LeadsController extends BaseController
                     'No of Employees at Renewal' => $rfq_data['renewal_emp_count'],
                     'Total Sum Insured at Renewal ' => $rfq_data['total_si_at_renewal'],
                     'Policy Period' => !empty($rfq_data['policy_start_date']) && !empty($rfq_data['policy_end_date']) ? date('d-m-Y', strtotime($rfq_data['policy_start_date'])) . ' to ' . date('d-m-Y', strtotime($rfq_data['policy_end_date'])) : "To be decided",
-                    'Insurer' => $rfq_data['insurer_name'] ?? " - ",
-                    'TPA' => $rfq_data['tpa_name'] ?? " - ",
+                    // 'Insurer' => $rfq_data['insurer_name'] ?? " - ",
+                    // 'TPA' => $rfq_data['tpa_name'] ?? " - ",
                     'Policy Type' => $this->leadType[$rfq_data['lead_type']] ?? "",
                     'Existing Insurer' => $rfq_data['insurer_name'],
-                    'TPA ' => $rfq_data['tpa_name'],
+                    // 'TPA ' => $rfq_data['tpa_name'],
                 ];
             }
         }
diff --git a/app/Models/ClientPolicyModel.php b/app/Models/ClientPolicyModel.php
index 5c43b52e..14d6b065 100755
--- a/app/Models/ClientPolicyModel.php
+++ b/app/Models/ClientPolicyModel.php
@@ -249,8 +249,19 @@ class ClientPolicyModel extends Model
     }
 
 
-    public function getDepositData($clientId, $insurerId, $cd_ac_pk = null)
-    {
+    public function getDepositData($clientId, $insurerId, $cd_ac_pk = null, $subTypeOptions = null)
+    {   
+
+        if($subTypeOptions != null){
+            $caseSql = "CASE cash_deposit.sub_type";
+            foreach ($subTypeOptions as $key => $label) {
+                $caseSql .= " WHEN {$key} THEN " . $this->db->escape($label);
+            }
+            $caseSql .= " ELSE 'Unknown' END AS sub_type_text";
+        }else{
+            $caseSql = "";
+        }
+
         // Fetch the deposit data based on client and insurer IDs       
        $query = $this->db->table('cash_deposit')
             ->select('cash_deposit.*')
@@ -260,6 +271,7 @@ class ClientPolicyModel extends Model
             // ->select('policies.name as policy_name')
             ->select('policy_type.policy_type')
             ->select('user_profiles.first_name as username')
+            ->select($caseSql)
             ->join('user_profiles', 'user_profiles.id = cash_deposit.created_by', 'left')
             ->join('insurers', 'insurers.id = cash_deposit.insurer_id', 'left')
             ->join('clients', 'clients.id = cash_deposit.client_id', 'left')
diff --git a/app/Models/EmployeePolicyModel.php b/app/Models/EmployeePolicyModel.php
index f6ff81ed..ec4b9222 100755
--- a/app/Models/EmployeePolicyModel.php
+++ b/app/Models/EmployeePolicyModel.php
@@ -224,7 +224,28 @@ class EmployeePolicyModel extends Model
     public function getEmployeePolicy($client_id = 0, $policy_id = 0, $status = [], $branch_id = 0, $emp_code = "", $emp_name = "")
     {
         // dd($status);
-
+        $ecard_download_link = "
+            CASE 
+                WHEN 
+                    LOWER(emp.relationship) = 'self' AND
+                    employee_polices.tpa_id IS NOT NULL AND employee_polices.tpa_id != '' AND
+                    employee_polices.uhid IS NOT NULL AND employee_polices.uhid != ''
+                THEN 
+                    CASE 
+                        WHEN 
+                            (employee_polices.tpa_id IS NOT NULL AND employee_polices.tpa_id != '') 
+                            AND 
+                            (employee_polices.uhid IS NOT NULL AND employee_polices.uhid != '') 
+                        THEN 
+                            CONCAT('" . base_url('download-e-card/') . "', employee_polices.rand_string, '/1')
+                        ELSE 
+                            null
+                    END 
+                ELSE 
+                    NULL
+            END AS ecard_download_link
+        ";
+        
         $result = $this->select([
             'employee_polices.*',
             'policy_type.policy_type as policy_name',
@@ -257,6 +278,7 @@ class EmployeePolicyModel extends Model
             'client_branch.branch_code as client_branch_code',
             'cp.policy_no',
             'cp.policy_type_id',
+            $ecard_download_link
         ])
             ->join('employees emp', 'employee_polices.employee_id = emp.id')
             ->join('client_policy cp', 'employee_polices.client_policy_id = cp.id') //cp - client policy
@@ -603,6 +625,7 @@ class EmployeePolicyModel extends Model
         $insurer_or_tpa = $ref_data['insurer_or_tpa'];
 
         $endorsement_condition = "{$insurer_or_tpa}" === 'tpa' ? "AND (a.endorsement_id IS NOT NULL OR a.endorsement_id != '')" : "AND (a.endorsement_id IS NULL OR a.endorsement_id = '')";
+        $subquery_endorsement_condition = "{$insurer_or_tpa}" === 'tpa' ? "WHERE (endorsement_id IS NOT NULL OR endorsement_id != '')" : "WHERE (endorsement_id IS NULL OR endorsement_id = '')";
 
 
         $query = $this->db->query("
@@ -676,6 +699,7 @@ class EmployeePolicyModel extends Model
                         CAST(MAX(CASE WHEN field_name = 'premium' THEN old_value END) AS DECIMAL(10,2)) AS old_si_premium,
                         MAX(CASE WHEN field_name = 'si_enhancement_date' THEN new_value END) AS date_of_coverage
                         FROM emp_endorsement
+                        $subquery_endorsement_condition
                         GROUP BY emp_code
                     ) AS sidata ON a.emp_code = sidata.emp_code
                     WHERE employee_polices.client_policy_id = '{$client_policy_id}'