Fix issue with keyword having unexpected characters and the api not liking it