Remove media_type condition to support not only cloud but also normal content