Fix annotation selection