[FIX] XQuery: query info construction revised