Refactoring in filter, constructor.
Fix OR operator that not appeared