Add batch_id-with-timestamp indexes to message store