better annotation-focus behaviour in editor