STS-3231: change scope of template to xml tags