Improved google analytics tracking