Changed substring search to wild card substr