fix filter logic to corresponding metric...