Optimized filter handling
Fixed a build script issue