Multi word filename bugfixes