Query String for handshake fix
Query String for handshake fix