PIM-3250 : rework metric filter