fixes to urllib quoting