Added empty value for select and change selected options to use keys.