Improve GA tag implementation