Add tags to answer template
Merge answer template