Ce 1018 exacttarget refactoring i2

Unfortunately not. Murray used an old schema which has city-list instead of city_list set as a name and a customer key. It can go when he changes it.