Code clean, removed unused methods
Improved filter condition generation