Smooth searches
Merge branch 'master' into gh-pages

Smoothen up the search