added tags to templates