PIM-1530: Clean code on MetricFilter