Fix media filter with context
Merge pull request #677 from Prims47/master

Fix media filter with context
Merge remote-tracking branch 'sonata-project/master'