Updates from csalazar repository

Fixed double encoding of the urls