Fix for querystrings