moved filter to model