Made regexes more robust against new un/edifact definitions