fix fitering
added anothing
added anything v2
fix conflict