Removed all the smelly code made by a few previous commits. Now additional fields from the option object are copied to the option tag attributes.