When searching products, do not search on the current filter unless it's nearby

That is, when searching on popular or mix-it-up, remove the sort=-popular|-random stuff so we can get more accurate results.