Escape / sanitization fixes