Support for query strings on handshake