better order id handling