Updated collection searches to match base implementation.