Ajay/Melanie | #2880 | Bugfix - Displayed filename is same as downloaded filename