A few little tweaks for content selection. Stripped quotes from output filename as not supported on Windows