#15 fine tuning ordernumber format