fix: export event selector and replace function selector with event selector where appropriate#7095