Some fixes in "unread" state handling