Fix order scenarios in backend