[MRM-943] only show "search within results" on the results page, and improve the surrounding text Merged from: r694533 on trunk