Data points should correctly be associated with respective event types now. No more index errors.