Modified the templating code to use a tag file