Unbreak Search (needed to be updated after changing the Collector type)