Resolved more build errors related to searching collections.