Fix Downloading, add file extension to downloaded filename