Implementing new query editor.