General fixed to Supply Orders functionality

This PR addresses issues raised in #1224 and #1262.