Hotfix, wrong order no and duplicated container subtype.
Refactor for order.