Better handling of special characters in inputs #49