Updated analytics filtering