Improved code for decoding URLs, added handling of + (plus)