Make search more consistent
Merge pull request #1134 from reciprocity/feature/lhn-search

Make search more consistent