Fix sort by ID