Added some sanitization for inputs