- added queryEditor infrastructur