Add ability to use Google Analytics Universal instead of GA Default + fix