Unnecessary filter check removed
Boolean filter
Restructured