3.08: fix parsing of tags with spaces preceding them
3.08: handle extensions in the Diversion header better