diff --git a/app/Filters/PaymentFilters.php b/app/Filters/PaymentFilters.php
index 236eeba519c0..14bb35086b11 100644
--- a/app/Filters/PaymentFilters.php
+++ b/app/Filters/PaymentFilters.php
@@ -40,7 +40,10 @@ class PaymentFilters extends QueryFilters
                           ->orWhere('custom_value1', 'like', '%'.$filter.'%')
                           ->orWhere('custom_value2', 'like', '%'.$filter.'%')
                           ->orWhere('custom_value3', 'like', '%'.$filter.'%')
-                          ->orWhere('custom_value4', 'like', '%'.$filter.'%');
+                          ->orWhere('custom_value4', 'like', '%'.$filter.'%')
+                          ->orWhereHas('client', function ($q) use ($filter) {
+                                $q->where('name', 'like', '%'.$filter.'%');
+                            });
         });
     }
 
diff --git a/app/Filters/RecurringInvoiceFilters.php b/app/Filters/RecurringInvoiceFilters.php
index a3c201fc3775..660c40bf8a33 100644
--- a/app/Filters/RecurringInvoiceFilters.php
+++ b/app/Filters/RecurringInvoiceFilters.php
@@ -34,17 +34,15 @@ class RecurringInvoiceFilters extends QueryFilters
         }
 
         return  $this->builder->where(function ($query) use ($filter) {
-            $query->where('number', 'like', '%'.$filter.'%')
-                          ->orWhere('date', 'like', '%'.$filter.'%')
-                          ->orWhere('amount', 'like', '%'.$filter.'%')
-                          ->orWhere('balance', 'like', '%'.$filter.'%')
-                          ->orWhere('custom_value1', 'like', '%'.$filter.'%')
-                          ->orWhere('custom_value2', 'like', '%'.$filter.'%')
-                          ->orWhere('custom_value3', 'like', '%'.$filter.'%')
-                          ->orWhere('custom_value4', 'like', '%'.$filter.'%')
-                          ->orWhereHas('client', function ($q) use ($filter) {
-                              $q->where('name', 'like', '%'.$filter.'%');
-                          });
+              $query->where('date', 'like', '%'.$filter.'%')
+                    ->orWhere('amount', 'like', '%'.$filter.'%')
+                    ->orWhere('custom_value1', 'like', '%'.$filter.'%')
+                    ->orWhere('custom_value2', 'like', '%'.$filter.'%')
+                    ->orWhere('custom_value3', 'like', '%'.$filter.'%')
+                    ->orWhere('custom_value4', 'like', '%'.$filter.'%')
+                    ->orWhereHas('client', function ($q) use ($filter) {
+                        $q->where('name', 'like', '%'.$filter.'%');
+                    });
         });
     }
 
diff --git a/app/Filters/TaskFilters.php b/app/Filters/TaskFilters.php
index 7a2495f1d434..a53d6e330958 100644
--- a/app/Filters/TaskFilters.php
+++ b/app/Filters/TaskFilters.php
@@ -39,7 +39,13 @@ class TaskFilters extends QueryFilters
                           ->orWhere('custom_value1', 'like', '%'.$filter.'%')
                           ->orWhere('custom_value2', 'like', '%'.$filter.'%')
                           ->orWhere('custom_value3', 'like', '%'.$filter.'%')
-                          ->orWhere('custom_value4', 'like', '%'.$filter.'%');
+                          ->orWhere('custom_value4', 'like', '%'.$filter.'%')
+                          ->orWhereHas('project', function ($q) use ($filter) {
+                                $q->where('name', 'like', '%'.$filter.'%');
+                            })
+                          ->orWhereHas('client', function ($q) use ($filter) {
+                                $q->where('name', 'like', '%'.$filter.'%');
+                            });
         });
     }