[MOD] XQuery, output of detailed query info unified for API and command