Merge pull request #3615 from vieux/search_job

move search to a job