Csv Export tweaks