Use filtered file paths in upload (fixes #2836)