Added output encoding to deter XSS