fix some logic around when countersign annotations are shown