Added haystack search
Merge branch 'feature/search'