Minor improvements

Remove sort ordering that isn't required, and ensure that we don't include unwanted whitespace in search terms.