Updated field sort mappings