Refactor HomeController queries to separate object