Fixed name of the group that contains text field and refactored