fix uri encoding not covering some reserved characters