More accurate check for existing annotated content

[#83882366]