Reordered findAll and findById