Made the search reuse the search value