fix response and query