Update Analytics code for extended reports