Issue #9 implement filtering