Second attempt at filtering analytics