Restored sorting by id, less consistent but without unbearable side effects