Selection page event refactor