Use query.port rather than server-port for Query