fixed up some bugs in querystring for it's plone integration
Merge branch 'master' of github.com:plone/mockup