DF#QCADOOMES-1937 Some fixes in orders.