Media: improved clean queries