Filename quote

Pending demo.
Same as other pull.