Fix for filter/group spec change