Added name attribute into selectors to narrow fields it selects to only those with name (since it's used as the storage key for the field value).