Added comments to template-tags