Change stub data to use new filter and group by fields