fix editing of service address fields, from #21327