Fix the fields used for exportingt to csv