Issue #12 - made filters more dynamic.