Working on QueryDisplay request model integration.

It's a work in progress, still has bugs.