[URIGen][Google+] Working on Google+ Fix
[URIGen][Google+] Working on Google+ Fix