Revert "fixing query response keys"

This reverts commit 9e09c792032d6bc2d4b94ed0cbaa8a19aa46031c.