differentiate between raw and download

fixes #578