Improved support for options.span: doesn't get an inappropriate href attribute