Update sorting and switch back to _id