Fixes #2897: Long query string displayed as part of download file name
Merge pull request #2898 from deliciousbrains/bug-query-string-in-file-name

Fixes #2897: Long query string displayed as part of download file name