Finally fix the canonical processing and add google verification