refactor user list and tree fields