Refactor code in results page controller and resolved missing renames