fix job list - refactoring