diff --git a/app/Http/Controllers/Api/ConsumablesController.php b/app/Http/Controllers/Api/ConsumablesController.php
index 7c65e49bc..3054d9c03 100644
--- a/app/Http/Controllers/Api/ConsumablesController.php
+++ b/app/Http/Controllers/Api/ConsumablesController.php
@@ -27,27 +27,8 @@ class ConsumablesController extends Controller
     {
         $this->authorize('index', Consumable::class);
 
-        // This array is what determines which fields should be allowed to be sorted on ON the table itself, no relations
-        // Relations will be handled in query scopes a little further down.
-        $allowed_columns = 
-            [
-                'id',
-                'name',
-                'order_number',
-                'min_amt',
-                'purchase_date',
-                'purchase_cost',
-                'company',
-                'category',
-                'model_number', 
-                'item_no', 
-                'qty',
-                'image',
-                'notes',
-                ];
-
-        $consumables = Consumable::select('consumables.*')
-            ->with('company', 'location', 'category', 'users', 'manufacturer');
+        $consumables = Consumable::with('company', 'location', 'category', 'manufacturer')
+            ->withCount('users as consumables_users_count');
 
         if ($request->filled('search')) {
             $consumables = $consumables->TextSearch(e($request->input('search')));
@@ -89,15 +70,9 @@ class ConsumablesController extends Controller
         // Make sure the offset and limit are actually integers and do not exceed system limits
         $offset = ($request->input('offset') > $consumables->count()) ? $consumables->count() : app('api_offset_value');
         $limit = app('api_limit_value');
-
-        $allowed_columns = ['id', 'name', 'order_number', 'min_amt', 'purchase_date', 'purchase_cost', 'company', 'category', 'model_number', 'item_no', 'manufacturer', 'location', 'qty', 'image'];
         $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
 
-        $sort_override =  $request->input('sort');
-        $column_sort = in_array($sort_override, $allowed_columns) ? $sort_override : 'created_at';
-
-
-        switch ($sort_override) {
+        switch ($request->input('sort')) {
             case 'category':
                 $consumables = $consumables->OrderCategory($order);
                 break;
@@ -111,10 +86,30 @@ class ConsumablesController extends Controller
                 $consumables = $consumables->OrderCompany($order);
                 break;
             case 'supplier':
-                $components = $consumables->OrderSupplier($order);
+                $consumables = $consumables->OrderSupplier($order);
                 break;
             default:
-                $consumables = $consumables->orderBy($column_sort, $order);
+                // This array is what determines which fields should be allowed to be sorted on ON the table itself.
+                // These must match a column on the consumables table directly.
+                $allowed_columns = [
+                    'id',
+                    'name',
+                    'order_number',
+                    'min_amt',
+                    'purchase_date',
+                    'purchase_cost',
+                    'company',
+                    'category',
+                    'model_number',
+                    'item_no',
+                    'manufacturer',
+                    'location',
+                    'qty',
+                    'image'
+                ];
+
+                $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';
+                $consumables = $consumables->orderBy($sort, $order);
                 break;
         }