Make sorting more in line with what we will do on a server