[fixed] City structures no longer duplicated when loading

Change-Id: If698f5d2e3c1a6acbde5450fe8b62a89f4f00b66
Merge "[fixed] City structures no longer duplicated when loading" into unstable