removed some debug code
bug fix: return correct error messages for consolidated queries