Implements and/or filtering

Implementation of AND / OR filtering (#115)

Todo:
* [ ] Fix test
* [ ] Add new test using a data_class
* [ ] Update doc
* [ ] Add new upgrade file
* [ ] Add missing phpdoc