Improved endpoint notification update.
Optimised subscription view call
fixed merge conflict