tidy up large search box code
Merge branch 'master' of https://github.com/hbs-dev/tempgit