[GF#33039] Enhancement to contains search functionality.