Refactor/field with id

Fixed