More work on adding filters to the build.