Revert "Fixed filters (closes: #219)"

This reverts commit e8f3d88a547d15266042308d422ba4dc98f020cf.