Fixing logic that detects your current state of annotations