Improved functionality as to selecting/deselecting the options.