Query String for handshake fix