Google tracking improved