Urlencoding fixes