diff --git a/lib/data/models/client_model.dart b/lib/data/models/client_model.dart
index 4779d4a15..2fe0bf4c6 100644
--- a/lib/data/models/client_model.dart
+++ b/lib/data/models/client_model.dart
@@ -325,6 +325,16 @@ abstract class ClientEntity extends Object
             .toLowerCase()
             .compareTo(clientB.displayName.toLowerCase());
         break;
+      case ClientFields.contact:
+        response = clientA.primaryContact.fullName
+            .toLowerCase()
+            .compareTo(clientB.primaryContact.fullName.toLowerCase());
+        break;
+      case ClientFields.contactEmail:
+        response = clientA.primaryContact.email
+            .toLowerCase()
+            .compareTo(clientB.primaryContact.email.toLowerCase());
+        break;
       case ClientFields.balance:
         response = clientA.balance.compareTo(clientB.balance);
         break;
diff --git a/lib/data/models/product_model.dart b/lib/data/models/product_model.dart
index 1b25e8032..d667366eb 100644
--- a/lib/data/models/product_model.dart
+++ b/lib/data/models/product_model.dart
@@ -174,6 +174,9 @@ abstract class ProductEntity extends Object
       case ProductFields.cost:
         response = productA.cost.compareTo(productB.cost);
         break;
+      case ProductFields.quantity:
+        response = productA.quantity.compareTo(productB.quantity);
+        break;
       case ProductFields.updatedAt:
         response = productA.updatedAt.compareTo(productB.updatedAt);
         break;
diff --git a/lib/ui/app/tables/app_data_table.dart b/lib/ui/app/tables/app_data_table.dart
index d0a127b5e..8ef90a6e3 100644
--- a/lib/ui/app/tables/app_data_table.dart
+++ b/lib/ui/app/tables/app_data_table.dart
@@ -749,8 +749,8 @@ class AppDataTable extends StatelessWidget {
             : null,
         // IGNORE SORTING ON FIRST COLUMN
         sorted: displayCheckboxColumn
-            ? (dataColumnIndex + 1) == sortColumnIndex
-            : dataColumnIndex == sortColumnIndex,
+            ? dataColumnIndex == sortColumnIndex
+            : (dataColumnIndex - 1) == sortColumnIndex,
         ascending: sortAscending,
       );
       rowIndex = 1;
diff --git a/lib/ui/app/tables/entity_list.dart b/lib/ui/app/tables/entity_list.dart
index 78e027fbb..3ce5e48b6 100644
--- a/lib/ui/app/tables/entity_list.dart
+++ b/lib/ui/app/tables/entity_list.dart
@@ -182,7 +182,7 @@ class _EntityListState extends State<EntityList> {
                 onRefreshPressed: () => widget.onRefreshed(context),
               ),
               sortColumnIndex:
-                  widget.tableColumns.indexOf(listUIState.sortField) + 1,
+                  widget.tableColumns.indexOf(listUIState.sortField),
               sortAscending: listUIState.sortAscending,
             ),
           ),