Fix some search URL constructions I missed in 1914a6d52228dd0cfab8e0ff575a5af16d1a08d9. Address bug 834509.

There still needs to be a SPOT for this.
Pose some troubling questions as comments.