Fix two bug in rooms list maintainance