Fixed selection logic for options.