SDPIII-46 changes for showing custom fields in csv