Filter etc pass v2
pass JoinTest, need code clean