FIX #2: '+' not properly decoded in urls