Correcting templates to use new GA data.