updated template to work with latest x-tag-core