Fix tags for base template
merge