updated filter and raw data for agg