More code for querystring (related to #27)