Remove guessing of select option values