Fixed issue with unread count not updating