refs #6035 - adding more tagging details and other fixes