Use decodeURI, but still allow +