Bug fix: routing on events

Broken by previous check-in to add map (shifted around routing in
process, connection to 'events' lost.