Revert to substring match on value search.