Separate ongoing streams from finished streams

Done. Hope this will be considered.