Actually set the filename
Refactor filename/URL code
Fix for file extension collection