diff --git a/gen/go/proto/services/citizenstore/citizenstore.go b/gen/go/proto/services/citizenstore/citizenstore.go
index 78a55d509..b55356d71 100644
--- a/gen/go/proto/services/citizenstore/citizenstore.go
+++ b/gen/go/proto/services/citizenstore/citizenstore.go
@@ -510,9 +510,7 @@ func (s *Server) ListUserActivity(ctx context.Context, req *ListUserActivityRequ
 			orderBys = append(orderBys, column.DESC())
 		}
 	} else {
-		orderBys = append(orderBys,
-			tUserActivity.CreatedAt.DESC(),
-		)
+		orderBys = append(orderBys, tUserActivity.CreatedAt.DESC())
 	}
 
 	stmt := tUserActivity.
diff --git a/gen/go/proto/services/dmv/vehicles.go b/gen/go/proto/services/dmv/vehicles.go
index 074d3c4a0..925237e1f 100644
--- a/gen/go/proto/services/dmv/vehicles.go
+++ b/gen/go/proto/services/dmv/vehicles.go
@@ -150,9 +150,7 @@ func (s *Server) ListVehicles(ctx context.Context, req *ListVehiclesRequest) (*L
 			orderBys = append(orderBys, column.DESC())
 		}
 	} else {
-		orderBys = append(orderBys,
-			tVehicles.Plate.ASC(),
-		)
+		orderBys = append(orderBys, tVehicles.Plate.ASC())
 	}
 
 	columns := dbutils.Columns{
diff --git a/gen/go/proto/services/docstore/docstore.go b/gen/go/proto/services/docstore/docstore.go
index 8b9301726..4d0d90fbe 100644
--- a/gen/go/proto/services/docstore/docstore.go
+++ b/gen/go/proto/services/docstore/docstore.go
@@ -177,9 +177,7 @@ func (s *Server) ListDocuments(ctx context.Context, req *ListDocumentsRequest) (
 			)
 		}
 	} else {
-		orderBys = append(orderBys,
-			tDocumentShort.UpdatedAt.DESC(),
-		)
+		orderBys = append(orderBys, tDocumentShort.UpdatedAt.DESC())
 	}
 
 	pag, limit := req.Pagination.GetResponseWithPageSize(count.TotalCount, DocsDefaultPageSize)
diff --git a/gen/go/proto/services/jobs/colleagues.go b/gen/go/proto/services/jobs/colleagues.go
index 4051211c8..9baf31aaa 100644
--- a/gen/go/proto/services/jobs/colleagues.go
+++ b/gen/go/proto/services/jobs/colleagues.go
@@ -95,17 +95,17 @@ func (s *Server) ListColleagues(ctx context.Context, req *ListColleaguesRequest)
 	// Convert proto sort to db sorting
 	orderBys := []jet.OrderByClause{}
 	if req.Sort != nil {
-		var column jet.Column
+		var columns []jet.Column
 		switch req.Sort.Column {
 		case "name":
-			column = nil
+			columns = append(columns, tUser.Firstname, tUser.Lastname)
 		case "rank":
 			fallthrough
 		default:
-			column = tUser.JobGrade
+			columns = append(columns, tUser.JobGrade)
 		}
 
-		if column != nil {
+		for _, column := range columns {
 			if req.Sort.Direction == database.AscSortDirection {
 				orderBys = append(orderBys, column.ASC())
 			} else {
@@ -115,13 +115,10 @@ func (s *Server) ListColleagues(ctx context.Context, req *ListColleaguesRequest)
 	} else {
 		orderBys = append(orderBys,
 			tUser.JobGrade.ASC(),
+			tUser.Firstname.ASC(),
+			tUser.Lastname.ASC(),
 		)
 	}
-	// Always append firstname and lastname sorting
-	orderBys = append(orderBys,
-		tUser.Firstname.ASC(),
-		tUser.Lastname.ASC(),
-	)
 
 	stmt := tUser.
 		SELECT(
@@ -788,9 +785,7 @@ func (s *Server) ListColleagueActivity(ctx context.Context, req *ListColleagueAc
 			orderBys = append(orderBys, column.DESC())
 		}
 	} else {
-		orderBys = append(orderBys,
-			tJobsUserActivity.CreatedAt.DESC(),
-		)
+		orderBys = append(orderBys, tJobsUserActivity.CreatedAt.DESC())
 	}
 
 	tTargetUserProps := tUserProps.AS("target_user_props")
diff --git a/gen/go/proto/services/jobs/conduct.go b/gen/go/proto/services/jobs/conduct.go
index 0e0845fc6..cf3fe7d99 100644
--- a/gen/go/proto/services/jobs/conduct.go
+++ b/gen/go/proto/services/jobs/conduct.go
@@ -103,25 +103,25 @@ func (s *Server) ListConductEntries(ctx context.Context, req *ListConductEntries
 	// Convert proto sort to db sorting
 	orderBys := []jet.OrderByClause{}
 	if req.Sort != nil {
-		var column jet.Column
+		var columns []jet.Column
 		switch req.Sort.Column {
 		case "type":
-			column = tConduct.Type
+			columns = append(columns, tConduct.Type, tConduct.ID)
 		case "id":
 			fallthrough
 		default:
-			column = tConduct.ID
+			columns = append(columns, tConduct.ID)
 		}
 
-		if req.Sort.Direction == database.AscSortDirection {
-			orderBys = append(orderBys, column.ASC())
-		} else {
-			orderBys = append(orderBys, column.DESC())
+		for _, column := range columns {
+			if req.Sort.Direction == database.AscSortDirection {
+				orderBys = append(orderBys, column.ASC())
+			} else {
+				orderBys = append(orderBys, column.DESC())
+			}
 		}
 	} else {
-		orderBys = append(orderBys,
-			tConduct.ID.DESC(),
-		)
+		orderBys = append(orderBys, tConduct.ID.DESC())
 	}
 
 	tUser := tUser.AS("target_user")
diff --git a/gen/go/proto/services/jobs/timeclock.go b/gen/go/proto/services/jobs/timeclock.go
index 70441aca1..4e101512a 100644
--- a/gen/go/proto/services/jobs/timeclock.go
+++ b/gen/go/proto/services/jobs/timeclock.go
@@ -294,17 +294,17 @@ func (s *Server) ListInactiveEmployees(ctx context.Context, req *ListInactiveEmp
 	// Convert proto sort to db sorting
 	orderBys := []jet.OrderByClause{}
 	if req.Sort != nil {
-		var column jet.Column
+		var columns []jet.Column
 		switch req.Sort.Column {
 		case "name":
-			column = nil
+			columns = append(columns, tUser.Firstname, tUser.Lastname)
 		case "rank":
 			fallthrough
 		default:
-			column = tUser.JobGrade
+			columns = append(columns, tUser.JobGrade)
 		}
 
-		if column != nil {
+		for _, column := range columns {
 			if req.Sort.Direction == database.AscSortDirection {
 				orderBys = append(orderBys, column.ASC())
 			} else {
@@ -312,14 +312,8 @@ func (s *Server) ListInactiveEmployees(ctx context.Context, req *ListInactiveEmp
 			}
 		}
 	} else {
-		orderBys = append(orderBys,
-			tConduct.ID.DESC(),
-		)
+		orderBys = append(orderBys, tUser.JobGrade.ASC())
 	}
-	orderBys = append(orderBys,
-		tUser.Firstname.ASC(),
-		tUser.Lastname.ASC(),
-	)
 
 	stmt := tTimeClock.
 		SELECT(
diff --git a/gen/go/proto/services/qualifications/qualifications_requests.go b/gen/go/proto/services/qualifications/qualifications_requests.go
index 4de07d2ed..421b05f22 100644
--- a/gen/go/proto/services/qualifications/qualifications_requests.go
+++ b/gen/go/proto/services/qualifications/qualifications_requests.go
@@ -145,9 +145,7 @@ func (s *Server) ListQualificationRequests(ctx context.Context, req *ListQualifi
 			orderBys = append(orderBys, column.DESC())
 		}
 	} else {
-		orderBys = append(orderBys,
-			tQualiRequests.CreatedAt.DESC(),
-		)
+		orderBys = append(orderBys, tQualiRequests.CreatedAt.DESC())
 	}
 
 	stmt := tQualiRequests.
diff --git a/gen/go/proto/services/qualifications/qualifications_results.go b/gen/go/proto/services/qualifications/qualifications_results.go
index 2c15f59a2..e407ef70b 100644
--- a/gen/go/proto/services/qualifications/qualifications_results.go
+++ b/gen/go/proto/services/qualifications/qualifications_results.go
@@ -140,9 +140,7 @@ func (s *Server) ListQualificationsResults(ctx context.Context, req *ListQualifi
 			orderBys = append(orderBys, column.DESC())
 		}
 	} else {
-		orderBys = append(orderBys,
-			tQualiResults.CreatedAt.DESC(),
-		)
+		orderBys = append(orderBys, tQualiResults.CreatedAt.DESC())
 	}
 
 	stmt := tQualiResults.