fix for multi-template tag support