Improved handling of unread counts