diff --git a/app/Http/Controllers/NocController.php b/app/Http/Controllers/NocController.php
index 0d06263..bcb66ce 100644
--- a/app/Http/Controllers/NocController.php
+++ b/app/Http/Controllers/NocController.php
@@ -146,7 +146,7 @@
             if ($request->has('search') && !empty($request->get('search'))) {
                 $search = $request->get('search');
                 $query->where(function ($q) use ($search) {
-                    $q->where('nomor_registrasi', 'LIKE', "%$search%");
+                    $q->orWhereRelation('penawaran', 'nomor_registrasi', 'LIKE', '%' . $search . '%');
                 });
             }
 
diff --git a/app/Http/Controllers/PembayaranController.php b/app/Http/Controllers/PembayaranController.php
index ada9491..ce9139c 100644
--- a/app/Http/Controllers/PembayaranController.php
+++ b/app/Http/Controllers/PembayaranController.php
@@ -43,7 +43,7 @@
             if ($request->has('search') && !empty($request->get('search'))) {
                 $search = $request->get('search');
                 $query->where(function ($q) use ($search) {
-                    $q->where('nomor_registrasi', 'LIKE', "%$search%");
+                    $q->orWhereRelation('penawaran', 'nomor_registrasi', 'LIKE', '%' . $search . '%');
                 });
             }
 
diff --git a/app/Http/Controllers/PenilaiController.php b/app/Http/Controllers/PenilaiController.php
index d475e9c..0903d54 100644
--- a/app/Http/Controllers/PenilaiController.php
+++ b/app/Http/Controllers/PenilaiController.php
@@ -327,9 +327,10 @@ class PenilaiController extends Controller
         // Apply search filter if provided
         if ($request->has('search') && !empty($request->get('search'))) {
             $search = $request->get('search');
-            $columns = ['nomor_registrasi', 'debiture.name', 'branch.name', 'user.name', 'tujuanPenilaian.name', 'jenisfasilitasKredit.name'];
+            $columns = ['debiture.name', 'branch.name', 'user.name', 'tujuanPenilaian.name', 'jenisfasilitasKredit.name'];
 
             $query->where(function ($q) use ($search, $columns) {
+                $q->where('nomor_registrasi', 'LIKE', '%' . $search . '%');
                 foreach ($columns as $column) {
                     $q->orWhereRelation(explode('.', $column)[0], explode('.', $column)[1], 'LIKE', '%' . $search . '%');
                 }
diff --git a/app/Http/Controllers/ProsesPenawaranController.php b/app/Http/Controllers/ProsesPenawaranController.php
index 5fd2e92..6339a94 100644
--- a/app/Http/Controllers/ProsesPenawaranController.php
+++ b/app/Http/Controllers/ProsesPenawaranController.php
@@ -95,10 +95,10 @@ class ProsesPenawaranController extends Controller
         if ($request->has('search') && !empty($request->get('search'))) {
             $search = $request->get('search');
             $query->where(function ($q) use ($search) {
-                $q->where('nomor_registrasi', 'LIKE', '%' . $search . '%');
-                $q->orWhere('tanggal_permohonan', 'LIKE', '%' . $search . '%');
-                $q->orWhereRelation('tujuanPenilaianKJPP', 'name', 'LIKE', '%' . $search . '%');
-                $q->orWhere('status', 'LIKE', '%' . $search . '%');
+                $q->where('penawaran.nomor_registrasi', 'LIKE', '%' . $search . '%');
+                //$q->orWhere('tanggal_permohonan', 'LIKE', '%' . $search . '%');
+                //$q->orWhereRelation('tujuanPenilaianKJPP', 'name', 'LIKE', '%' . $search . '%');
+                //$q->orWhere('status', 'LIKE', '%' . $search . '%');
             });
         }
 
diff --git a/app/Http/Controllers/RegistrasiFinalController.php b/app/Http/Controllers/RegistrasiFinalController.php
index d2bb6fa..e7b17b2 100644
--- a/app/Http/Controllers/RegistrasiFinalController.php
+++ b/app/Http/Controllers/RegistrasiFinalController.php
@@ -57,9 +57,8 @@
                 $search = $request->get('search');
                 $query->where(function ($q) use ($search) {
                     $q->where('nomor_registrasi', 'LIKE', '%' . $search . '%');
-                    $q->orWhere('tanggal_permohonan', 'LIKE', '%' . $search . '%');
-
-                    $q->orWhere('status', 'LIKE', '%' . $search . '%');
+                    //$q->orWhere('tanggal_permohonan', 'LIKE', '%' . $search . '%');
+                    //$q->orWhere('status', 'LIKE', '%' . $search . '%');
                 });
             }
 
diff --git a/app/Http/Controllers/SLAController.php b/app/Http/Controllers/SLAController.php
index 2c70d1d..423084d 100644
--- a/app/Http/Controllers/SLAController.php
+++ b/app/Http/Controllers/SLAController.php
@@ -77,12 +77,10 @@ class SLAController extends Controller
         if ($request->has('search') && !empty($request->get('search'))) {
             $search = $request->get('search');
             $query->where(function ($q) use ($search) {
-                $q->where('nomor_registrasi', 'LIKE', '%' . $search . '%');
-                $q->orWhere('tanggal_permohonan', 'LIKE', '%' . $search . '%');
+                $q->orWhereRelation('permohonan', 'nomor_registrasi', 'LIKE', '%' . $search . '%');
+                $q->orWhereRelation('permohonan', 'tanggal_permohonan', 'LIKE', '%' . $search . '%');
                 $q->orWhereRelation('user', 'name', 'LIKE', '%' . $search . '%');
-                $q->orWhereRelation('debiture', 'name', 'LIKE', '%' . $search . '%');
-                $q->orWhereRelation('jenisPenilaian', 'name', 'LIKE', '%' . $search . '%');
-                $q->orWhereRelation('branch', 'name', 'LIKE', '%' . $search . '%');
+                $q->orWhereRelation('permohonan.debiture', 'name', 'LIKE', '%' . $search . '%');
                 $q->orWhere('status', 'LIKE', '%' . $search . '%');
             });
         }
diff --git a/app/Http/Controllers/SpkController.php b/app/Http/Controllers/SpkController.php
index 828170e..8908860 100644
--- a/app/Http/Controllers/SpkController.php
+++ b/app/Http/Controllers/SpkController.php
@@ -46,9 +46,8 @@ use Illuminate\Support\Facades\Auth;
                 $search = $request->get('search');
                 $query->where(function ($q) use ($search) {
                     $q->whereRelation('permohonan','nomor_registrasi', 'LIKE', '%' . $search . '%');
-                    $q->orWhere('tanggal_permohonan', 'LIKE', '%' . $search . '%');
-
-                    $q->orWhere('status', 'LIKE', '%' . $search . '%');
+                    //$q->orWhere('tanggal_permohonan', 'LIKE', '%' . $search . '%');
+                    //$q->orWhere('status', 'LIKE', '%' . $search . '%');
                 });
             }