Major fix in google_analytics helper