NXIO-161: fix query