Hoa tagging upgrade