Beginning of refactoring of search results page