Remove 'batch_search'. See #12347
Merge pull request #2580 from will-moore/batch_search_12347

Remove 'batch_search'. See #12347