refactored selectors