Add support for document non-format type
Support noformat, ordinalvalue
Correct typos