Renaming and simplifying BusEvent/Notification classes
Fix search API for notifications