Improve card sorting to use a single server request