Improved notifications + rxjs.query