Bug 234293 - complete the conversion from "query" terminology to "search" terminology. Patch by gerv; r=justdave, kiko, a=justdave.