Fixing querystring defect - missing & - also added test