Tag: improve reporting accuracy