Continuing changes to notifications, esp index

Also eager loading events for notifications