add filter, fix bugs
fix conflict