update controller handling
Notifications -> Notification
Massive refactoring of filter and notification handling