BugFix: doc_type can have underscores