Rework onSelect event trigger/catcher