Fix field value sort order