Add rudimentary haystack search