Revised JDOM tagging