Notifications Performance Improvements

Closes #2904

/cc @aerych (Thanks in advance sir!)