Need 'Project Categories ID' filter for Task Report (not just Project Category ID)

[#1]

Sometimes a project custom form I want filtered in a task report isn't the first custom form in the project and I'm realizing that it's not pulling tasks from projects where that form isn't the top form. The only option right now is 'Project > Category ID' and no option for 'Categories' (similar to if you pull Assigned To in a task report it'll only show the primary task assignee, not all assignees and should use 'Assignment Users' instead.

So then you have task reports that only pull if form you're using in the report happens to be the first form used in the project, so when projects use other forms and this happens to not be first, it’s not including those tasks I want only because of this. WF says because it's two table jumps there is no way around this.