Fix issue #362 - QueryString support