Fix issue with languages with non URL safe characters (eg: C++)