Merge pull request #556 from cyrilraja/master

*Fixed DO-5396 6.5 [BE] [Search] shows one review, but when I click on i...
*more changes on DO-5396