fix field names and display order