this helps?  but this search is still royally fucked by the last changes.  RT#23621