[sprint 30] fixing analytics