Added a check for order id in order items