Updated all analytics event tracking to actually work