added haystack search