add: improved cmfilter behavior and remove metrics