Added check for Google O Auth URL Handling and few changes.