Updated the query for XML Queue map