COMMON: update map resolve fields