removed all search and haystack reference