Add more sanitization  and escaping.