changed querystrign parsing