[bug 891438] Tidy up search text
Merge pull request #247 from daleee/891438-proper-no-results-on-search

[bug 891438] Tidy up search text
[bug t881699] Sorting for webmaker:teach-