Fix sonar in review page
Merge pull request #121 from IanMayo/feature/eugene/sonar-in-review-page

Fix sonar in review page