Fix issues about missing query string params #28 and #29

Fixes issues #28 and #29