Fix selection and field name