Tokenizer now cleans up malformed links