Updates to google analytics tracking to support advanced features