Tweaks to the job query