Added filter by party