Mapper: removed some debugging code
ConsolidatedQuery: fixed a concurrency bug