diff --git a/src/Data/Access.fs b/src/Data/Access.fs
index ddb7896..c5cc2c2 100644
--- a/src/Data/Access.fs
+++ b/src/Data/Access.fs
@@ -136,7 +136,10 @@ module SmallGroups =
                  INNER JOIN {Table.Church} c ON c.data->>'id' = g.data->>'churchId'"
 
     /// The ORDER BY clause for select list item queries
-    let private itemOrderBy = "ORDER BY c.data->>'name', g.data->>'name'"
+    let private itemOrderBy =
+        Query.orderBy
+            [ { Field.Named "name" with Qualifier = Some "c" }; { Field.Named "name" with Qualifier = Some "g" } ]
+            SQLite
 
     /// Map a row to a Small Group list item
     let private toSmallGroupItem (rdr: SqliteDataReader) =
@@ -193,7 +196,7 @@ module SmallGroups =
             $"{infoQuery}
               WHERE g.data->'preferences'->>'isPublic' = TRUE
                  OR COALESCE(g.data->'preferences'->>'groupPassword', '') <> ''
-              ORDER BY c.data->>'churchName', g.data->>'groupName'"
+              {itemOrderBy}"
             []
             SmallGroupInfo.FromReader