Fixing tooltip mixup between add and remove layers