Make avatar mode switchable also when overlapping territories are present.