CHALLENGE+REVIEW two little fixes regarding safe-tagging of text