diff --git a/src/acquisition_cost/service.py b/src/acquisition_cost/service.py
index a41dcf0..c1e0ed7 100644
--- a/src/acquisition_cost/service.py
+++ b/src/acquisition_cost/service.py
@@ -48,9 +48,12 @@ async def get_all(
     common,
 ):
     """Returns all documents."""
-    query = Select(AcquisitionData).order_by(AcquisitionData.name.asc())
+    query = Select(AcquisitionData).order_by(AcquisitionData.category_no.asc())
     if search:
-        query = query.filter(cast(AcquisitionData.name, String).ilike(f"%{search}%"))
+        query = query.filter(
+            (cast(AcquisitionData.name, String).ilike(f"%{search}%"))
+            | (cast(AcquisitionData.category_no, String).ilike(f"%{search}%"))
+        )
 
     common["items_per_page"] = items_per_page
     results = await search_filter_sort_paginate(model=query, **common)