Fixes to template and tag.