Adding indexOf to search for substring