Okay. So with a little effort, I wrote a basic patch. See the attached. I went
with the "search for %s -> prompt for query" approach. Of course, the code is
bad - I'm not a great or even good coder, but it should serve as an outline that
you could give me feedback on.