Issue #8808 by tuj: Changed to fit new media type field