before merging in production changes
merged in notif_views
added indexes to a few fields