Fixing bare querystring parameters, github #52

Added a fix, and more test cases.  I ran into this problem as well.