Subcontracting Order and Subcontracting BOM bug review fixes

Subcontracting Order and Subcontracting BOM bugs from the bug review are fixed, one commit and test each.