job form and result fixes
merge fix