Fixed xss on name set