added substring search