adding missing spans
fixing bulk conversion problems