diff --git a/app/Controllers/PayoutController.php b/app/Controllers/PayoutController.php
index 01cd7251..29e8b555 100644
--- a/app/Controllers/PayoutController.php
+++ b/app/Controllers/PayoutController.php
@@ -439,7 +439,7 @@ class PayoutController extends BaseController
         $agentCode = $agent["agent_code"];
 
         $today = date("Ymd");
-        $likePattern = "INV/$agentCode/$today/%";
+        $likePattern = "NIIB/$agentCode/$today/%";
 
         $count = $this->invoiceModel
                     ->like("invoice_no", $likePattern)
@@ -447,7 +447,7 @@ class PayoutController extends BaseController
 
         $nextNumber = $count + 1;
 
-        return "INV/$agentCode/$today/$nextNumber";
+        return "NIIB/$agentCode/$today/$nextNumber";
     }
 
     // private function generateInvoiceNumber()
diff --git a/app/Models/InvoiceModel.php b/app/Models/InvoiceModel.php
index ba3388bd..bebd0022 100644
--- a/app/Models/InvoiceModel.php
+++ b/app/Models/InvoiceModel.php
@@ -23,6 +23,7 @@ class InvoiceModel extends Model
         'created_by',
         'updated_at',
         'payout_status',
+        'broker_id'
     ];
 
     // Timestamps
@@ -219,7 +220,8 @@ class InvoiceModel extends Model
 
             if ($flag == 1) { // Add mode
                     // EXCLUDE all policies that exist in partner_invoice_items            
-                    $builder->where("pt.id NOT IN (SELECT policy_id FROM partner_invoice_items)", null, false);
+                    $builder->where("pp.id NOT IN (SELECT policy_id FROM partner_invoice_items)", null, false);
+                    $builder->where("pt.policy_no NOT IN (SELECT policy_no FROM partner_invoice_items)", null, false);
             }
 
             if ($flag == 2) { // Edit mode