Jobs filter refactor