DF#QCADOOMES-1863 fixes in order report