Update some templates to use slugs if available