Order Id-s now take order history into account