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.
Merge pull request #9 from adam-vessey/7.x

Flip around how we use the provided parameters.