improve condition editor with address filter