Fixing query interface response format