added/changed REST; query callback is optional now