Improves notifications about new annotations

Fixes #7055