diff --git a/app/Controllers/EnquiryController.php b/app/Controllers/EnquiryController.php
index f34abc5..d5a4ce0 100644
--- a/app/Controllers/EnquiryController.php
+++ b/app/Controllers/EnquiryController.php
@@ -70,8 +70,8 @@ class EnquiryController extends ResourceController
             //Get enquiry details
             $enquiry = $this->enquiryModel->select('partner_enquiry.*, I.name as insurer_name ')
                                         ->join('insurers I', 'I.id = partner_enquiry.insurer_id', 'left')
-                                        ->where('id', $enquiry_id)
-                                        ->where('is_active', 1)
+                                        ->where('partner_enquiry.id', $enquiry_id)
+                                        ->where('partner_enquiry.is_active', 1)
                                         ->first();
 
             if (!$enquiry) {
@@ -91,15 +91,19 @@ class EnquiryController extends ResourceController
             //Get related policies
             $policies = [];
             if (!empty($quotations)) {
-                $quotationIds = array_column($quotations, 'id');
+                $quotationId = 0;
+                foreach ($quotations as $key => $value) {
+                   if($value['status'] == 'Accepted') { $quotationId = $value['id']; }
+                }
+               
                 $policies = $this->PolicyModel->select('partner_policy.*, pe.reg_no, I.name as insurer_name, pq.insured_declared_value,  ipti.insurance_plan_type')
                                             ->join('partner_enquiry pe', 'pe.id = partner_policy.enquiry_id', 'left')
                                             ->join('insurers I', 'I.id = pe.insurer_id', 'left')
                                             ->join('partner_quotation pq', 'pq.id = partner_policy.quotation_id', 'left')
                                             ->join('partner_insurance_plan_type_master ipti', 'ipti.id = pq.insurance_plan_type_id', 'left')
-                                            ->whereIn('partner_policy.quotation_id', $quotationIds)
+                                            ->where('partner_policy.quotation_id', $quotationId)
                                             ->where('partner_policy.is_active', 1)
-                                            ->findAll();
+                                            ->first();
             }
 
             // Final response
diff --git a/app/Controllers/PolicyController.php b/app/Controllers/PolicyController.php
index 911a755..44d8a2d 100644
--- a/app/Controllers/PolicyController.php
+++ b/app/Controllers/PolicyController.php
@@ -121,7 +121,7 @@ class PolicyController extends ResourceController
             }
 
             // Call helper to create BDS record after creating client,clientPolicy,vehicle records
-            $policyData = $this->PolicyModel->select('partner_policy.*,E.insurer_id,E.insurer_branch_id,E.name as client_name,E.mobile as client_mobile,E.email as client_email,E.reg_no')
+            $policyData = $this->PolicyModel->select('partner_policy.*,E.insurer_id,E.insurer_branch_id,E.name as client_name,E.mobile as client_mobile,E.email as client_email,E.reg_no,E.vehicle_type_id')
                                             ->join('partner_quotation Q', 'Q.id = partner_policy.quotation_id', 'left')
                                             ->join('partner_enquiry E', 'E.id = partner_policy.enquiry_id', 'left')
                                             ->where('partner_policy.id',$policyId)