Generic: added the ability to specify a tag name when adding replacements