2D Filter Statistics portlet links broken if one of the axis fields has more than one context

We have a custom field with 2 contexts, one global, one for one specific project. If you create a 2D filter statistics portlet, and pick that custom field as either of the axis fields, most of the links within the portlet return incorrect results. The results get filtered to the 1 project with its own context.

For example:

custom field called Tester
1 global context, 1 context for project FD (id=10082)
2D filter stats portlet with Tester as Y axis, Status as X axis
pid=10082 gets added to the URLs for each Tester (row header), each cell, and each row total