Change mapping for residence field: cityid => address

Please help me review and merge