Annotation selection, removed redundant controls