Use %20 instead of + to conform to RFC 3986