fix filter logical issue, from AND to OR
Merge remote-tracking branch 'origin/master'