Performance improvements to google plugin