update SearchRaw to handle more general strings