Fix analytics for multiple-submit flows