Differentiating optional measure tags

[#64634450]