Option select boxes set correct option value #654