Backed out template change and put id in each template.