- fixed up MetricEntityPicker so that the Entity related controls are not shown unless the selected Metric is associated with an EntityType