Fixed bug with querystrings