'#2163 Creates a map to store the correspondence between a query escaped

'#2163 Creates a map to store the correspondence between a query escaped #5480