fixes for synonym select/unselect, added cancel to confirm exit