Yhuang/improve filters 2