wip tagging enhancements, refs #7127, refs #6047