Commercial jobs tweaks

Small changes for commercial jobs component.