Comment 6 for bug 1353643

I'll be getting back to looking at this, but since it touches search, and there's both been a bit of drift in search and there is upcoming work to change it further, this will probably need to be recast a little bit. Assigning it to myself to keep it in front of me while looking at search stuff in the future...