Improve embedded measurement filtering