Move filtering to mixin instead of inheriting (fixes #18, fixes #87)