Added better linking to the search