Change output dir
Fix more problems with the Filter support