Map popup_fields: maintain sort order as per UI