Handle more files with spaces and special chars