Support plus signs with filenames