Poll api on stream update to keep data synced
Small clean up