Refactor events controller

Notification filtering.