Fixed: Re-add missing tags in templates