PIM-1555 Fixes media mapping