improve WallFilter & merged from merlin-master