Some more work on query editing.