Use batches_with_addresses index instead of batches_with_timestamps index where necessary.
Use batches_with_addresses index instead of batches_with_timestamps index where necessary.

harrissoerja/vumi,vishwaprakashmishra/xmatrix,vishwaprakashmishra/xmatrix,harrissoerja/vumi,vishwaprakashmishra/xmatrix,harrissoerja/vumi