Fixes for url quote/unquote