Fixes haystack search
Merge pull request #385 from mauler/fix-haystack-search

Fixes haystack search