Minor change to how folder options are processed