modify media field handling (#14045 & #14048)
Merge pull request #142 from Kunstmaan/media-field-handling

modify media field handling (#14045 & #14048)