Updated code for filtering jobs...