Implemented filtering with logical operators
Moved filter logic from BasicEntityCollection to utils/PredicateGenerator
Some refractoring