Move the filters to separate file