Merge pull request #1043 from rustyswayne/Refactor/M-502

Extends the QueryDisplay model and starts experiment with a resource pattern.