Merge pull request #2180 from VinRudramurthy/dev-branch

Resource reorder: issue rectified with showing error message.
Search: Updted the implemented new story related to reviews visibility on dev-branch from 6.6.3.a1.