More work on query editing.