Relabel section selection for events

Closes #1934