Better selected option detection.