adding proper string search