Fix performance data handling

1) Fix to work with labels that include single quote and spaces

2) Strip the UOM off values coming back so we properly treat them as
numeric metrics instead of text.