Fix filter condition
Refactor, remove magic strings