Topic/fix csv exports