Adds `client_address` and `client_port` to `"query"` `info` field
Fixes review feedback