I don’t know if this will help but have you experimented with PRE_FILTER’s / other aggregations?
All in all though, I will mark this as a feature request.