fixed indexedStream() - no longer matches on substring