Make sort order consistent with the JPA sort order