fix query forwarding