more query editing behaviour