Move filter to model package