Improve analytic event resolution