Fixed up the download/entries saving logic