Google Analytics tracking improvement