more cosmetic updates to the template tags