Fixed Issue #7, #8, #11 - filtering