Follow up on notifcation counts

Follow up on remaining review for notification counts #1023