some fixes on csv export