[#44387639] Refactor search by batch. Specs pass.