Feedback fixes
Added special fix for rich review