Refactored select options to work better with input strings