Switching to urllib and adding quoting