Added some markup around option elements.