I think we're going to go with #3, and also use that setting to control the context menu search, since that has the same issues, plus a couple of additional once.
I think we're going to go with #3, and also use that setting to control the context menu search, since that has the same issues, plus a couple of additional once.