Fixes #771 - Ensure that media map fields are parsed prior to the generic map fields