#718 - Improve Google Analytics Support