Moved field value filtering logic into Measure model as class method