switches between streaming and polling should be more reliable now