better tag handling for all metric types
6 files changed