Improve search results
Merge pull request #29 from gojp/improve-query

Improve search results