Better search for jobs close #26