PIM-1530: Clean metric filter type