Fixed possible auto-download loop in DownloadService

fixes #443, fixes #468