Small change to search logic
Small change to searcher logic