Publisher template fixes and enhancements