Include Query Folders From Model Builder to Report Building Interface

Using folder groupings in the Query Building interface is an excellent way to keep track of my tables, parameters, etc...

However, once I load/apply these queries, the Report Builder does not keep the folders, and I am left with a big messy list of all the queries I have built in the "Fields" pane.

It would be awesome if my folders would carry into the "Fields" pane, allowing me to expand/collapse between them, and better navigate my ridiculously confusing data model.