Some more collapsing fixes from the search update