Refactored notification selector