fixes from tag-template dev