Updated filter to actually fix the Groups filter