Filtering now supported by fluent api