Fixed the filename escaping issues.