Fix: Restore all behaviour of order management of line. The new one is too complex and could not work as it is done.