Fixed field name sorting with field type change