modified output tags to replace underscores with hyphens, based on xmllint report