Added more texts, support substring