MT#5879 Fix data row for zones and attributes broken by renaming