More work on the batch download feature