Remove the top-level search collection when there are no more search collections.

I'm still not convinced this is the right way to do this, but it's at least a partial bug fix.

This reverts commit 1203272