Adding tag and group filters, 

Copied what you did for the CasePivot for ActivityPivot and CaseWithActivityPivot which we were discussing working through here https://redmine.fuzion.co.nz/issues/5962
Did I do it correctly :)