does that new `N/query` handle your second point?