Bug fix with having/not having batches downloaded