Fixed issue with initial selection and default label.