Comment 18 for bug 1235497

After doing some additional simple testing, much of the search code assumes those combined rows will be there, so that last idea is out (for this release, at least). The branch as committed seems to be working correctly for me.