Improve notifications handling