Update filter implementations to remove JsonObject as an instance variable.
Update filter implementations to remove JsonObject as an instance variable.
Update grouping implementations to remove JsonObject as an instance variable.
Fix merge conflicts.