fix issue with missing end() call
fix regression with filter management
Merge remote-tracking branch 'sonata-project/master'