Job filters refactoring