Better search results and querying
Merge branch 'master' into gh-pages