[TIMOB-15916] Fixed bug with analytics events not being properly formatt...

...ed. This ticket also resolves [TIMOB-13630] and [TIMOB-13629].