rearrange flow of batch download, #947