Fixed the submenu links, so that they include the "query" component.