integrated bug fixes for the google api call