diff --git a/app/Filters/ClientFilters.php b/app/Filters/ClientFilters.php
index 834540061e51..2cf72b638e1a 100644
--- a/app/Filters/ClientFilters.php
+++ b/app/Filters/ClientFilters.php
@@ -68,9 +68,11 @@ class ClientFilters extends QueryFilters
 
     public function email(string $email = ''): Builder
     {
-        return
+        if (strlen($email) == 0) {
+            return $this->builder;
+        }
 
-        $this->builder->whereHas('contacts', function ($query) use ($email) {
+        return $this->builder->whereHas('contacts', function ($query) use ($email) {
             $query->where('email', $email);
         });
     }
@@ -86,11 +88,19 @@ class ClientFilters extends QueryFilters
 
     public function id_number(string $id_number = ''): Builder
     {
+        if (strlen($id_number) == 0) {
+            return $this->builder;
+        }
+
         return $this->builder->where('id_number', $id_number);
     }
 
     public function number(string $number = ''): Builder
     {
+        if (strlen($number) == 0) {
+            return $this->builder;
+        }
+
         return $this->builder->where('number', $number);
     }
 
diff --git a/app/Filters/CreditFilters.php b/app/Filters/CreditFilters.php
index 47f5e69b1fe8..61247aad1e5d 100644
--- a/app/Filters/CreditFilters.php
+++ b/app/Filters/CreditFilters.php
@@ -87,6 +87,10 @@ class CreditFilters extends QueryFilters
 
     public function number(string $number = ''): Builder
     {
+        if (strlen($number) == 0) {
+            return $this->builder;
+        }
+
         return $this->builder->where('number', $number);
     }
 
diff --git a/app/Filters/ExpenseFilters.php b/app/Filters/ExpenseFilters.php
index 2520ae58ec51..1e3a622b7def 100644
--- a/app/Filters/ExpenseFilters.php
+++ b/app/Filters/ExpenseFilters.php
@@ -134,6 +134,10 @@ class ExpenseFilters extends QueryFilters
 
     public function number(string $number = ''): Builder
     {
+        if (strlen($number) == 0) {
+            return $this->builder;
+        }
+
         return $this->builder->where('number', $number);
     }
 
diff --git a/app/Filters/PaymentFilters.php b/app/Filters/PaymentFilters.php
index 09aafd28856a..c98cb9bd43e1 100644
--- a/app/Filters/PaymentFilters.php
+++ b/app/Filters/PaymentFilters.php
@@ -80,6 +80,10 @@ class PaymentFilters extends QueryFilters
 
     public function number(string $number = ''): Builder
     {
+        if (strlen($number) == 0) {
+            return $this->builder;
+        }
+
         return $this->builder->where('number', $number);
     }
 
diff --git a/app/Filters/ProjectFilters.php b/app/Filters/ProjectFilters.php
index 55ca4f14c147..4d1cb2199ca6 100644
--- a/app/Filters/ProjectFilters.php
+++ b/app/Filters/ProjectFilters.php
@@ -40,6 +40,10 @@ class ProjectFilters extends QueryFilters
     
     public function number(string $number = ''): Builder
     {
+        if (strlen($number) == 0) {
+            return $this->builder;
+        }
+
         return $this->builder->where('number', $number);
     }
 
diff --git a/app/Filters/PurchaseOrderFilters.php b/app/Filters/PurchaseOrderFilters.php
index cd6c6b1da0a0..f99a7f3a8105 100644
--- a/app/Filters/PurchaseOrderFilters.php
+++ b/app/Filters/PurchaseOrderFilters.php
@@ -102,6 +102,10 @@ class PurchaseOrderFilters extends QueryFilters
 
     public function number(string $number = ''): Builder
     {
+        if (strlen($number) == 0) {
+            return $this->builder;
+        }
+
         return $this->builder->where('number', $number);
     }
 
diff --git a/app/Filters/QuoteFilters.php b/app/Filters/QuoteFilters.php
index 1c6e7625b3f7..950d6bc00497 100644
--- a/app/Filters/QuoteFilters.php
+++ b/app/Filters/QuoteFilters.php
@@ -113,6 +113,10 @@ class QuoteFilters extends QueryFilters
 
     public function number($number = ''): Builder
     {
+        if (strlen($number) == 0) {
+            return $this->builder;
+        }
+
         return $this->builder->where('number', $number);
     }
 
diff --git a/app/Filters/RecurringExpenseFilters.php b/app/Filters/RecurringExpenseFilters.php
index 45ed9f122fec..fa30dc401575 100644
--- a/app/Filters/RecurringExpenseFilters.php
+++ b/app/Filters/RecurringExpenseFilters.php
@@ -42,6 +42,10 @@ class RecurringExpenseFilters extends QueryFilters
 
     public function number(string $number = ''): Builder
     {
+        if (strlen($number) == 0) {
+            return $this->builder;
+        }
+
         return $this->builder->where('number', $number);
     }
 
diff --git a/app/Filters/RecurringInvoiceFilters.php b/app/Filters/RecurringInvoiceFilters.php
index fc0a721b5045..7b981f2cd80c 100644
--- a/app/Filters/RecurringInvoiceFilters.php
+++ b/app/Filters/RecurringInvoiceFilters.php
@@ -85,6 +85,10 @@ class RecurringInvoiceFilters extends QueryFilters
 
     public function number(string $number = ''): Builder
     {
+        if (strlen($number) == 0) {
+            return $this->builder;
+        }
+
         return $this->builder->where('number', $number);
     }
 
diff --git a/app/Filters/RecurringQuoteFilters.php b/app/Filters/RecurringQuoteFilters.php
index 799a1831f2b1..8c35c25b5c75 100644
--- a/app/Filters/RecurringQuoteFilters.php
+++ b/app/Filters/RecurringQuoteFilters.php
@@ -41,6 +41,10 @@ class RecurringQuoteFilters extends QueryFilters
 
     public function number(string $number = ''): Builder
     {
+        if (strlen($number) == 0) {
+            return $this->builder;
+        }
+
         return $this->builder->where('number', $number);
     }
 
diff --git a/app/Filters/SystemLogFilters.php b/app/Filters/SystemLogFilters.php
index 8360f1d1da14..1bef963a1e2b 100644
--- a/app/Filters/SystemLogFilters.php
+++ b/app/Filters/SystemLogFilters.php
@@ -20,16 +20,28 @@ class SystemLogFilters extends QueryFilters
 {
     public function type_id(int $type_id): Builder
     {
+        if (isset($event_id) == 0) {
+            return $this->builder;
+        }
+        
         return $this->builder->where('type_id', $type_id);
     }
 
     public function category_id(int $category_id): Builder
     {
+        if (isset($event_id) == 0) {
+            return $this->builder;
+        }
+
         return $this->builder->where('category_id', $category_id);
     }
 
     public function event_id(int $event_id): Builder
     {
+        if (isset($event_id) == 0) {
+            return $this->builder;
+        }
+
         return $this->builder->where('event_id', $event_id);
     }
 
diff --git a/app/Filters/TaskFilters.php b/app/Filters/TaskFilters.php
index e7a455f89cee..d3e7c77c673a 100644
--- a/app/Filters/TaskFilters.php
+++ b/app/Filters/TaskFilters.php
@@ -84,6 +84,10 @@ class TaskFilters extends QueryFilters
     
     public function number(string $number = ''): Builder
     {
+        if (strlen($number) == 0) {
+            return $this->builder;
+        }
+
         return $this->builder->where('number', $number);
     }
 
diff --git a/app/Filters/VendorFilters.php b/app/Filters/VendorFilters.php
index feb0b339cd6a..4b5c456875ae 100644
--- a/app/Filters/VendorFilters.php
+++ b/app/Filters/VendorFilters.php
@@ -48,6 +48,10 @@ class VendorFilters extends QueryFilters
 
     public function number(string $number = ''): Builder
     {
+        if (strlen($number) == 0) {
+            return $this->builder;
+        }
+
         return $this->builder->where('number', $number);
     }