fix concurrent modification exception in zoneTracker and deviceTracker