XSS fix, post linking fix