Some consistancy in returning to job from tesk creation/edit