Fixes api specs (changed markup defaults).
Fixes embedded xml tag handling, when it has attrs.