fixed: push sanitisation to later in the parsing to capture more automagic.