closes #524 by changing option tag formats