models/step2: added observer; queries