Add Watir and tagName fields, fix toolTip.