Flip around how we use the provided parameters.

Need to use our values first, as the values provided from the result-
list highlighting can break things.