Move filter to own file