fields selection refactor