2.3/dev onQuery improvements