Fix up a variety of bugs in the jobs filters and simplify the logic