Improve measurement related filters