Handle underscores in filenames