Move popit-resolver to haystack search