Improved expression parsing for quantity
fix on metric reduction, added Metric.Axis compareable