Hotfix/angular/comment list