CON-2026 | refactored selectors