Fixed removed template_tags