Make topnavigation and index use new search URL structure