diff --git a/app/Ninja/Datatables/ProductDatatable.php b/app/Ninja/Datatables/ProductDatatable.php
index be2001fc2947..33c691806b85 100644
--- a/app/Ninja/Datatables/ProductDatatable.php
+++ b/app/Ninja/Datatables/ProductDatatable.php
@@ -43,14 +43,14 @@ class ProductDatatable extends EntityDatatable
                 $account->invoice_item_taxes,
             ],
             [
-                '-' . Utils::getCustomLabel($account->custom_invoice_item_label1),
+                'custom_value1',
                 function ($model) {
                     return $model->custom_value1;
                 },
                 $account->custom_invoice_item_label1
             ],
             [
-                '-' . Utils::getCustomLabel($account->custom_invoice_item_label2),
+                'custom_value2',
                 function ($model) {
                     return $model->custom_value2;
                 },
diff --git a/app/Ninja/Repositories/ProductRepository.php b/app/Ninja/Repositories/ProductRepository.php
index 30d5f9cdb2a9..86f9cfed59e4 100644
--- a/app/Ninja/Repositories/ProductRepository.php
+++ b/app/Ninja/Repositories/ProductRepository.php
@@ -41,7 +41,9 @@ class ProductRepository extends BaseRepository
         if ($filter) {
             $query->where(function ($query) use ($filter) {
                 $query->where('products.product_key', 'like', '%'.$filter.'%')
-                      ->orWhere('products.notes', 'like', '%'.$filter.'%');
+                      ->orWhere('products.notes', 'like', '%'.$filter.'%')
+                      ->orWhere('products.custom_value1', 'like', '%'.$filter.'%')
+                      ->orWhere('products.custom_value2', 'like', '%'.$filter.'%');
             });
         }