Improved handling of additional options such as inline, iframe and rel.