adjust order of fields, omit empty fields for mediapartners #9954