Fixing order no and container subtype replicated issues.