Include measure type (EP or EH) in measure and value set counts