Update gtag

Too much work on that part, should be simplier