Don't report target index if not indexing
Add generator stream