Strengthen arguments sanitization