Revert "Fix Bug 226 - querystring widget bugs"

This reverts commit 32d9c66955386c8eba3e40df96fdc2ca302e6558.