diff --git a/inventory/views.py b/inventory/views.py
index 8b6318ed..434a540b 100644
--- a/inventory/views.py
+++ b/inventory/views.py
@@ -7464,7 +7464,8 @@ class BillListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):
         qs = dealer.entity.get_bills()
         query = self.request.GET.get("q")
         if query:
-            qs = qs.filter(vendor__vendor_name__icontains=query)
+            qs = qs.filter(Q(bill_number__icontains=query)|
+                           Q(vendor__vendor_name__icontains=query))
         return qs
 
     def get_context_data(self, **kwargs):
@@ -10152,49 +10153,10 @@ def InventoryItemCreateView(request, dealer_slug):
     )
 
 
-# def inventory_items_filter(request):
-#     year = request.GET.get("year")
-#     make = request.GET.get("make")
-#     model = request.GET.get("model")
-#     serie = request.GET.get("serie")
-
-#     # Get all makes for initial dropdown
-#     makes = models.CarMake.objects.all()
-#     print(make)
-#     model_data = models.CarModel.objects.none()
-#     serie_data = models.CarSerie.objects.none()
-#     trim_data = models.CarTrim.objects.none()
-
-#     if make:
-#         make_obj = models.CarMake.objects.get(pk=int(make))
-#         model_data = make_obj.carmodel_set.all()
-#     if model:
-#         model_obj = models.CarModel.objects.get(pk=model)
-#         serie_data = model_obj.carserie_set.all()
-#         if year:
-#             serie_data = serie_data.filter(year_begin__lte=year, year_end__gte=year)
-#     if serie:
-#         serie_obj = models.CarSerie.objects.get(pk=serie)
-#         trim_data = serie_obj.cartrim_set.all()
-
-#     # Generate year choices (adjust range as needed)
-#     current_year = datetime.now().year
-#     year_choices = range(current_year, current_year - 10, -1)
-
-#     context = {
-#         "makes": makes,
-#         "model_data": model_data,
-#         "serie_data": serie_data,
-#         "trim_data": trim_data,
-#         "year_choices": year_choices,
-#         "selected_make": make,
-#         "selected_model": model,
-#         "selected_serie": serie,
-#         "selected_year": year,
-#     }
-#     return render(request, "cars/partials/recall_filter_form.html", context)
 @login_required
-def inventory_items_filter(request,dealer_slug=None):
+@permission_required("django_ledger.view_purchaseordermodel", raise_exception=True)
+def inventory_items_filter(request, dealer_slug):
+    dealer = get_object_or_404(models.Dealer, slug=dealer_slug)
     year = request.GET.get("year", None)
     make = request.GET.get("make")
     model = request.GET.get("model")
@@ -10807,8 +10769,6 @@ def staff_password_reset_view(request, dealer_slug, user_pk):
     form = forms.CustomSetPasswordForm(staff.user)
     return render(request, 'users/user_password_reset.html', {'form': form})
 
-
-
 class RecallListView(ListView):
     model = models.Recall
     template_name = 'recalls/recall_list.html'
diff --git a/templates/crm/leads/lead_list.html b/templates/crm/leads/lead_list.html
index 926654d4..2592ffa1 100644
--- a/templates/crm/leads/lead_list.html
+++ b/templates/crm/leads/lead_list.html
@@ -33,7 +33,7 @@
 
         <div class="row g-3">
             <div class="col-12">
-                {% if page_obj.object_list %}
+                {% if page_obj.object_list or request.GET.q%}
                     <div class="table-responsive scrollbar mx-n1 px-1">
                         <table class="table align-items-center table-flush table-hover">
                             <thead>
@@ -245,6 +245,10 @@
                                                 {% endif %}
                                             </td>
                                         </tr>
+                                     {% empty %}
+                                         <tr>
+                                          <td colspan="6" class="text-center">{% trans "No Leads found." %}</td>
+                                        </tr>
                                     {% endfor %}
                                 </tbody>
                             </table>
diff --git a/templates/customers/customer_list.html b/templates/customers/customer_list.html
index 5163d5fc..15aee501 100644
--- a/templates/customers/customer_list.html
+++ b/templates/customers/customer_list.html
@@ -27,7 +27,7 @@
                 <div class="d-flex">{% include 'partials/search_box.html' %}</div>
             </div>
         </div>
-        {% if page_obj.object_list %}
+        {% if page_obj.object_list or request.GET.q%}
             <div class="table-responsive scrollbar transition">
                 <table class="table align-items-center table-flush table-hover">
                     <thead>
@@ -159,6 +159,11 @@
                                     {% endif %}
                                 </td>
                             </tr>
+                             {% empty %}
+                                         <tr>
+                                          <td colspan="6" class="text-center">{% trans "No Customers found." %}</td>
+                                        </tr>
+                                  
                         {% endfor %}
                     </tbody>
                 {% endif %}
diff --git a/templates/items/expenses/expenses_list.html b/templates/items/expenses/expenses_list.html
index 0f34ce85..1fcb90c4 100644
--- a/templates/items/expenses/expenses_list.html
+++ b/templates/items/expenses/expenses_list.html
@@ -16,7 +16,7 @@
             {% endif %}
         </div>
         {% include "partials/search_box.html" %}
-        {% if page_obj.object_list %}
+        {% if page_obj.object_list or request.GET.q%}
             <div class="table-responsive px-1 scrollbar mt-3">
                 <table class="table align-items-center table-flush">
                     <thead>
@@ -44,7 +44,7 @@
                             </tr>
                         {% empty %}
                             <tr>
-                                <td colspan="6" class="text-center text-muted">{% trans "No Accounts Found" %}</td>
+                                <td colspan="6" class="text-center text-muted">{% trans "No Expenses Found" %}</td>
                             </tr>
                         {% endfor %}
                     </tbody>
diff --git a/templates/items/service/service_list.html b/templates/items/service/service_list.html
index 0de3164a..aa472e9f 100644
--- a/templates/items/service/service_list.html
+++ b/templates/items/service/service_list.html
@@ -15,7 +15,7 @@
             {% endif %}
         </div>
         {% include "partials/search_box.html" %}
-        {% if page_obj.object_list %}
+        {% if page_obj.object_list or request.GET.q %}
             <div class="table-responsive px-1 scrollbar mt-3">
                 <table class="table align-items-center table-flush">
                     <thead>
@@ -45,7 +45,7 @@
                             </tr>
                         {% empty %}
                             <tr>
-                                <td colspan="6" class="text-center text-muted">{% trans "No Accounts Found" %}</td>
+                                <td colspan="6" class="text-center text-muted">{% trans "No Services Found" %}</td>
                             </tr>
                         {% endfor %}
                     </tbody>
diff --git a/templates/ledger/bank_accounts/bank_account_list.html b/templates/ledger/bank_accounts/bank_account_list.html
index de6aaac3..0049bf7b 100644
--- a/templates/ledger/bank_accounts/bank_account_list.html
+++ b/templates/ledger/bank_accounts/bank_account_list.html
@@ -13,7 +13,7 @@
             {% endif %}
         </div>
         {% include "partials/search_box.html" %}
-        {% if page_obj.object_list %}
+        {% if page_obj.object_list or request.GET.q%}
             <div class="table-responsive px-1 scrollbar mt-3">
                 <table class="table align-items-center table-flush">
                     <thead>
diff --git a/templates/ledger/coa_accounts/account_list.html b/templates/ledger/coa_accounts/account_list.html
index 6c49cae8..32d1b973 100644
--- a/templates/ledger/coa_accounts/account_list.html
+++ b/templates/ledger/coa_accounts/account_list.html
@@ -201,10 +201,10 @@
     </div>
 
 {% else %}
-
-{% endif %}
-  {% url "account_create" request.dealer.slug as create_account_url %}
+ {% url "account_create" request.dealer.slug as create_account_url %}
   {% include "empty-illustration-page.html" with value="account" url=create_account_url %}
+{% endif %}
+ 
 {% endblock %}
 {% block customerJS %}
     <script>
diff --git a/templates/organizations/organization_list.html b/templates/organizations/organization_list.html
index e1bc7d21..3dc1308d 100644
--- a/templates/organizations/organization_list.html
+++ b/templates/organizations/organization_list.html
@@ -172,7 +172,12 @@
                                     {% endif %}
                                 </td>
                             </tr>
-                        {% endfor %}
+                             {% empty %}
+                                         <tr>
+                                          <td colspan="6" class="text-center">{% trans "No Organizations found." %}</td>
+                                        </tr>
+        
+                             {% endfor %}
                     </tbody>
                 </table>
             </div>
diff --git a/templates/vendors/vendors_list.html b/templates/vendors/vendors_list.html
index 215a8c20..e8df6baf 100644
--- a/templates/vendors/vendors_list.html
+++ b/templates/vendors/vendors_list.html
@@ -22,7 +22,7 @@
             {% endif %}
         </div>
         {% include "partials/search_box.html" %}
-        {% if page_obj.object_list %}
+        {% if page_obj.object_list or request.GET.q%}
             <div class="table-responsive px-1 scrollbar mt-3">
                 <table class= "table align-items-center table-flush table-hover">
                     <thead>
@@ -147,7 +147,7 @@
                                 </tr>
                             {% empty %}
                                 <tr>
-                                    <td colspan="6" class="text-center text-muted">{% trans "No Accounts Found" %}</td>
+                                    <td colspan="6" class="text-center text-muted">{% trans "No Vendors Found" %}</td>
                                 </tr>
                             {% endfor %}
                         </tbody>