some fixes on job order
fixes conflicts on add job order