Fixes https://github.com/spulec/moto/issues/74
Clean up querystring logic.