Updated links, added guard to search q