updates to make streaming records work properly