Update url encoding to handle simples and doubles quotes