Case 2796 - Fixed some issues.
Case 2796 - Fixed reviews.
Merge remote-tracking branch 'origin/case-2796' into new-search

* origin/case-2796:
  Case 2796 - Fixed reviews.
  Case 2796 - Fixed some issues.