Add more structure into the search page