ticket:9 templates improvements