Updated templates affected by tag url bug