Fix issue #362 - QueryString support

Closes #362