Job2 submit fix and control improvement