Media: improved clean queries
Merge branch 'master' into filesystem