fix new result streaming logic some more