Add more stuff to download file name

Fixes #1648