Make the event streams into the internal collection to correctly end them

I think this was a bug before, the code was missing to set the stream in the internal collection so that it ends when the componen is unmounted.