Support using commas in folder names in the file selector (see #5823)