Fix duplicate display of comments
Fix display when coming with or wihtout selecting portfolio