Fix and break notification counts
Fix and break the notification count