Changed: deleted stream handling cleanup & fixes in event-by-type-index