fixing query response keys