[Nsi-wg] Query modifications - Issue 49