fixed new bugs in notifications