Add code for search more batches