Multimedia bulk fix

revert revert
minor bug fix